Add -reorder-basic-blocks option and fix nop insertion

tests_lit/llvm2ice_tests/nop-insertion.ll

Index: tests_lit/llvm2ice_tests/nop-insertion.ll
diff --git a/tests_lit/llvm2ice_tests/nop-insertion.ll b/tests_lit/llvm2ice_tests/nop-insertion.ll
index 197ddd32f3cb808b5429e2eced2ffc42e120b1ec..0c9a47f0c9f475ff78fd71e2cda1ef13f634c1f9 100644
--- a/tests_lit/llvm2ice_tests/nop-insertion.ll
+++ b/tests_lit/llvm2ice_tests/nop-insertion.ll
@@ -1,7 +1,5 @@
 ; This is a smoke test of nop insertion.
 
-; REQUIRES: allow_dump
-

[jvoung (off chromium), 2015/07/29 18:09:18]

Why remove REQUIRES: allow_dump ?

Does make -f Makefile.standalone check-lit MINIMAL=1 still work?

[qining, 2015/07/29 23:04:40]

Done. Sorry, I mistakenly removed it, it has been added back.

 ; Use filetype=asm because this currently depends on the # variant
 ; assembler comment.
 ; RUN: %p2i -i %s --filetype=asm -a -sz-seed=1 -nop-insertion \
@@ -19,82 +17,82 @@ entry:
   %res = mul <4 x i32> %a, %b
   ret <4 x i32> %res
 ; PROB50-LABEL: mul_v4i32
-; PROB50: nop # variant = 3
-; PROB50: subl $60, %esp
 ; PROB50: nop # variant = 4
+; PROB50: subl $60, %esp
 ; PROB50: movups %xmm0, 32(%esp)
-; PROB50: movups %xmm1, 16(%esp)
 ; PROB50: nop # variant = 0
-; PROB50: movups 32(%esp), %xmm0
+; PROB50: movups %xmm1, 16(%esp)
 ; PROB50: nop # variant = 4
+; PROB50: movups 32(%esp), %xmm0
 ; PROB50: pshufd $49, 32(%esp), %xmm1
 ; PROB50: pshufd $49, 16(%esp), %xmm2
 ; PROB50: pmuludq 16(%esp), %xmm0
-; PROB50: pmuludq %xmm2, %xmm1
 ; PROB50: nop # variant = 0
+; PROB50: pmuludq %xmm2, %xmm1
 ; PROB50: shufps $136, %xmm1, %xmm0
-; PROB50: pshufd $216, %xmm0, %xmm0
 ; PROB50: nop # variant = 2
+; PROB50: pshufd $216, %xmm0, %xmm0
 ; PROB50: movups %xmm0, (%esp)
 ; PROB50: movups (%esp), %xmm0
-; PROB50: addl $60, %esp
 ; PROB50: nop # variant = 0
+; PROB50: addl $60, %esp
+; PROB50: nop # variant = 3
 ; PROB50: ret
 
 ; PROB90-LABEL: mul_v4i32
-; PROB90: nop # variant = 3
-; PROB90: subl $60, %esp
 ; PROB90: nop # variant = 4
-; PROB90: movups %xmm0, 32(%esp)
+; PROB90: subl $60, %esp
 ; PROB90: nop # variant = 3
-; PROB90: movups %xmm1, 16(%esp)
+; PROB90: movups %xmm0, 32(%esp)
 ; PROB90: nop # variant = 2
-; PROB90: movups 32(%esp), %xmm0
+; PROB90: movups %xmm1, 16(%esp)
 ; PROB90: nop # variant = 3
-; PROB90: pshufd $49, 32(%esp), %xmm1
+; PROB90: movups 32(%esp), %xmm0
 ; PROB90: nop # variant = 4
-; PROB90: pshufd $49, 16(%esp), %xmm2
+; PROB90: pshufd $49, 32(%esp), %xmm1
 ; PROB90: nop # variant = 0
-; PROB90: pmuludq 16(%esp), %xmm0
+; PROB90: pshufd $49, 16(%esp), %xmm2
 ; PROB90: nop # variant = 2
-; PROB90: pmuludq %xmm2, %xmm1
+; PROB90: pmuludq 16(%esp), %xmm0
 ; PROB90: nop # variant = 3
-; PROB90: shufps $136, %xmm1, %xmm0
+; PROB90: pmuludq %xmm2, %xmm1
 ; PROB90: nop # variant = 4
-; PROB90: pshufd $216, %xmm0, %xmm0
+; PROB90: shufps $136, %xmm1, %xmm0
 ; PROB90: nop # variant = 2
-; PROB90: movups %xmm0, (%esp)
+; PROB90: pshufd $216, %xmm0, %xmm0
 ; PROB90: nop # variant = 4
-; PROB90: movups (%esp), %xmm0
+; PROB90: movups %xmm0, (%esp)
 ; PROB90: nop # variant = 2
+; PROB90: movups (%esp), %xmm0
+; PROB90: nop # variant = 3
 ; PROB90: addl $60, %esp
 ; PROB90: nop # variant = 3
 ; PROB90: ret
 
 ; MAXNOPS2-LABEL: mul_v4i32
-; MAXNOPS2: subl $60, %esp
 ; MAXNOPS2: nop # variant = 4
-; MAXNOPS2: movups %xmm0, 32(%esp)
+; MAXNOPS2: subl $60, %esp
 ; MAXNOPS2: nop # variant = 0
 ; MAXNOPS2: nop # variant = 4
+; MAXNOPS2: movups %xmm0, 32(%esp)
 ; MAXNOPS2: movups %xmm1, 16(%esp)
-; MAXNOPS2: movups 32(%esp), %xmm0
 ; MAXNOPS2: nop # variant = 0
-; MAXNOPS2: pshufd $49, 32(%esp), %xmm1
+; MAXNOPS2: movups 32(%esp), %xmm0
 ; MAXNOPS2: nop # variant = 2
+; MAXNOPS2: pshufd $49, 32(%esp), %xmm1
 ; MAXNOPS2: pshufd $49, 16(%esp), %xmm2
-; MAXNOPS2: pmuludq 16(%esp), %xmm0
 ; MAXNOPS2: nop # variant = 0
 ; MAXNOPS2: nop # variant = 3
+; MAXNOPS2: pmuludq 16(%esp), %xmm0
 ; MAXNOPS2: pmuludq %xmm2, %xmm1
 ; MAXNOPS2: shufps $136, %xmm1, %xmm0
-; MAXNOPS2: pshufd $216, %xmm0, %xmm0
 ; MAXNOPS2: nop # variant = 3
-; MAXNOPS2: movups %xmm0, (%esp)
+; MAXNOPS2: pshufd $216, %xmm0, %xmm0
 ; MAXNOPS2: nop # variant = 0
-; MAXNOPS2: movups (%esp), %xmm0
+; MAXNOPS2: movups %xmm0, (%esp)
 ; MAXNOPS2: nop # variant = 2
-; MAXNOPS2: addl $60, %esp
+; MAXNOPS2: movups (%esp), %xmm0
 ; MAXNOPS2: nop # variant = 4
+; MAXNOPS2: addl $60, %esp
 ; MAXNOPS2: ret
 }