Add option to force filetype=asm for testing

tests_lit/llvm2ice_tests/nonsfi.ll

Index: tests_lit/llvm2ice_tests/nonsfi.ll
diff --git a/tests_lit/llvm2ice_tests/nonsfi.ll b/tests_lit/llvm2ice_tests/nonsfi.ll
index bf40f16007b029ac4f05014799c9c427a1bd4f1a..643e47508f1fbfc4b5f081bff926f450030202bd 100644
--- a/tests_lit/llvm2ice_tests/nonsfi.ll
+++ b/tests_lit/llvm2ice_tests/nonsfi.ll
@@ -13,7 +13,7 @@ entry:
 }
 ; Expect a simple direct call to testCallRegular.
 ; NONSFI-LABEL: testCallRegular
-; NONSFI: call {{.*}} R_386_PC32 testCallRegular
+; NONSFI: call {{.*}} {{(R_386_PC32 testCallRegular)?}}

[Jim Stichnoth, 2016/01/10 03:08:56]

This regex is a little silly.

    R_386_PC32 testCallRegular.  Or not.  I'm a regex, not a cop.

One possibility is to add a '$' to the regex.

Probably better would be to call a different function, maybe @testLoadBasic(). 
It was originally done as a self-call purely for convenience.

[sehr, 2016/01/11 21:49:48]

Done.

 ; DEFAULT-LABEL: testCallRegular
 
 define internal double @testCallBuiltin(double %val) {
@@ -34,7 +34,7 @@ entry:
 }
 ; Expect a load with a R_386_GOTOFF relocation.
 ; NONSFI-LABEL: testLoadBasic
-; NONSFI: mov {{.*}} R_386_GOTOFF G1
+; NONSFI: mov {{.*}} R_386_GOTOFF {{G1|.bss}}
 ; DEFAULT-LABEL: testLoadBasic
 
 define internal i32 @testLoadFixedOffset() {
@@ -47,7 +47,7 @@ entry:
 }
 ; Expect a load with a R_386_GOTOFF relocation plus an immediate offset.
 ; NONSFI-LABEL: testLoadFixedOffset
-; NONSFI: mov {{.*}}+0x4] {{.*}} R_386_GOTOFF G1
+; NONSFI: mov {{.*}}+0x4] {{.*}} R_386_GOTOFF {{G1|.bss}}
 ; DEFAULT-LABEL: testLoadFixedOffset
 
 define internal i32 @testLoadIndexed(i32 %idx) {
@@ -63,7 +63,7 @@ entry:
 ; Expect a load with a R_386_GOTOFF relocation plus an immediate offset, plus a
 ; scaled index register.
 ; NONSFI-LABEL: testLoadIndexed
-; NONSFI: mov {{.*}}*4+0xc] {{.*}} R_386_GOTOFF G1
+; NONSFI: mov {{.*}}*4+0xc] {{.*}} R_386_GOTOFF {{G1|.bss}}
 ; DEFAULT-LABEL: testLoadIndexed
 
 define internal i32 @testLoadIndexedBase(i32 %base, i32 %idx) {
@@ -80,11 +80,11 @@ entry:
 ; Expect a load with a R_386_GOTOFF relocation plus an immediate offset, but
 ; without the scaled index.
 ; NONSFI-LABEL: testLoadIndexedBase
-; NONSFI: mov {{.*}}*1+0xc] {{.*}} R_386_GOTOFF G1
+; NONSFI: mov {{.*}}*1+0xc] {{.*}} R_386_GOTOFF {{G1|.bss}}
 ; By contrast, without -nonsfi, expect a load with a *R_386_32* relocation plus
 ; an immediate offset, and *with* the scaled index.
 ; DEFAULT-LABEL: testLoadIndexedBase
-; DEFAULT: mov {{.*}},DWORD PTR [{{.*}}+{{.*}}*4+0xc] {{.*}} R_386_32 G1
+; DEFAULT: mov {{.*}},DWORD PTR [{{.*}}+{{.*}}*4+0xc] {{.*}} R_386_32 {{G1|.bss}}
 
 define internal i32 @testLoadOpt() {
 entry:
@@ -97,8 +97,8 @@ entry:
 }
 ; Expect a load-folding optimization with a R_386_GOTOFF relocation.
 ; NONSFI-LABEL: testLoadOpt
-; NONSFI: mov [[REG:e..]],{{.*}}+0x0] {{.*}} R_386_GOTOFF G1
-; NONSFI-NEXT: add [[REG]],{{.*}}+0x0] {{.*}} R_386_GOTOFF G2
+; NONSFI: mov [[REG:e..]],{{.*}}+0x0] {{.*}} R_386_GOTOFF {{G1|.bss}}
+; NONSFI-NEXT: add [[REG]],{{.*}}+0x{{0|4}}] {{.*}} R_386_GOTOFF {{G2|.bss}}
 ; DEFAULT-LABEL: testLoadOpt
 
 define internal void @testRMW() {
@@ -111,5 +111,5 @@ entry:
 }
 ; Expect an RMW optimization with a R_386_GOTOFF relocation.
 ; NONSFI-LABEL: testRMW
-; NONSFI: add DWORD PTR {{.*}}+0x0],0x4d2 {{.*}} R_386_GOTOFF G1
+; NONSFI: add DWORD PTR {{.*}}+0x0],0x4d2 {{.*}} R_386_GOTOFF {{G1|.bss}}
 ; DEFAULT-LABEL: testRMW