Changes to rebase Subzero to LLVM 223109 APIs.

Changes to rebase Subzero to LLVM 223109 APIs.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=4026

[jvoung (off chromium), 2015-02-04 20:49:50]

jvoung@chromium.org changed reviewers:
+ jfb@chromium.org, kschimpf@google.com, stichnot@chromium.org

[jvoung (off chromium), 2015-02-04 20:52:06]

bah hold on... should have run make check first.

[Karl, 2015-02-04 20:52:24]

lgtm

[jvoung (off chromium), 2015-02-04 21:49:02]

Okay, the make check problem is from the removal of the --symbolize option.

The problem is that without that, llvm-objdump doesn't print the call target, so
a bunch of "call foo" checks fail.

I think we talked about maybe switching to plain objdump.

If it's okay, I'll send a different for that, but this will at least build and I
can stash it in a merge_36 branch.

[jvoung (off chromium), 2015-02-05 02:02:36]

On 2015/02/04 21:49:02, jvoung wrote:
> Okay, the make check problem is from the removal of the --symbolize option.
> 
> The problem is that without that, llvm-objdump doesn't print the call target,
so
> a bunch of "call foo" checks fail.
> 
> I think we talked about maybe switching to plain objdump.
> 
> If it's okay, I'll send a different for that, but this will at least build and
I
> can stash it in a merge_36 branch.

What do you think of stashing more of the command pipeline in %p2i?

Or create a separate stage in the pipeline?

E.g.,

diff --git a/pydir/run-llvm2ice.py b/pydir/run-llvm2ice.py
index 72925cc..14f56ac 100755
--- a/pydir/run-llvm2ice.py
+++ b/pydir/run-llvm2ice.py
@@ -43,6 +43,12 @@ def main():
                            default=None, metavar='LLVM_BIN_PATH',
                            help='Path to LLVM executables ' +
                                 '(for building PEXE files)')
+    argparser.add_argument('--assemble', required=False,
+                           action='store_true',
+                           help='Assemble the output')
+    argparser.add_argument('--disassemble', required=False,
+                           action='store_true',
+                           help='Disassemble the assembled output')
     argparser.add_argument('--echo-cmd', required=False,
                            action='store_true',
                            help='Trace command that generates ICE
instructions')
@@ -82,6 +88,13 @@ def main():
     cmd += args.args
     if args.llvm_source:
       cmd += [llfile]
+    if args.assemble:
+      cmd += ['|', os.path.join(llvm_bin_path, 'llvm-mc'),
+              '-triple=i686-none-nacl',
+              '-filetype=obj', '-o', '-']
+    if args.disassemble:
+      cmd += ['|', os.path.join(llvm_bin_path, 'llvm-objdump'),
+              '-d', '--symbolize', '-x86-asm-syntax=intel', '-']
 
     stdout_result = shellcmd(cmd, echo=args.echo_cmd)
     if not args.echo_cmd:
diff --git a/tests_lit/llvm2ice_tests/64bit.pnacl.ll
b/tests_lit/llvm2ice_tests/64bit.pnacl.ll
index d6d6afc..53ed245 100644
--- a/tests_lit/llvm2ice_tests/64bit.pnacl.ll
+++ b/tests_lit/llvm2ice_tests/64bit.pnacl.ll
@@ -2,9 +2,8 @@
 ; particular the patterns for lowering i64 operations into constituent
 ; i32 operations on x86-32.
 
-; RUN: %p2i -i %s --args -O2 --verbose none \
-; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
-; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
+; RUN: %p2i --assemble --disassemble -i %s --args -O2 --verbose none | \
+;        FileCheck %s
 ; RUN: %p2i -i %s --args -Om1 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - \

[Karl, 2015-02-05 17:04:36]

I like your suggestion. Go ahead and add it.