Clean up run script to use for testing Subzero.

Clean up run script to use for testing Subzero.

Adds the python script run-llvm2ice.py (was llvm2iceinsts.py) that
automatically handles conversion of LLVM source to a PEXE file,
and then runs llvm2ice on the corresponding PEXE file.

Also, defines three paths in tests, based on the executable chosen:

  %lc2i - Directly reads from LLVM source, and converts to Subzero.
  %l2i  - Parses a PEXE file into LLVM IR, and converts to Subzero.
  %p2i  - Parses a PEXE directly into Subzero.

Note that for all three executables, the same arguments can be used,
making it easy to change how the input is handled.

Also moves tests to use %p2i whenever possible.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=3892
R=jvoung@chromium.org

Committed: https://gerrit.chromium.org/gerrit/gitweb?p=native_client/pnacl-subzero.git;a=commit;h=2a5324a18d9be65945f5cec7c870319c47ac89a8

[Karl, 2014-09-24 19:58:18]

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

[jvoung (off chromium), 2014-09-24 20:35:19]

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py
File pydir/run-llvm2ice.py (right):

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py#ne...
pydir/run-llvm2ice.py:26: help='Stop afer translating to Subzero instructions')
after

https://codereview.chromium.org/600043002/diff/20001/tests_lit/lit.cfg
File tests_lit/lit.cfg (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/lit.cfg#newcode61
tests_lit/lit.cfg:61: # Note: l2i should is prefered over lc2i, since it uses
PNaCl bitcode.
should is preferred -> should be preferred

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
File tests_lit/llvm2ice_tests/load.ll (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
tests_lit/llvm2ice_tests/load.ll:3: ; TODO(kschimpf) Find out why lc2i and
--llvm is needed.
nit: --llvm is not visible here?

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
File tests_lit/llvm2ice_tests/switch-opt.ll (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
tests_lit/llvm2ice_tests/switch-opt.ll:6: ; RUN: %p2i -i %s -a  --verbose none |
FileCheck --check-prefix=ERRORS %s
nit: extra space

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
File tests_lit/llvm2ice_tests/unnamed.ll (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
tests_lit/llvm2ice_tests/unnamed.ll:3: ; RUN: %p2i -i %s --args -notranslate
-verbose=inst | FileCheck %s
is this the same as --insts ?

[Jim Stichnoth, 2014-09-24 20:37:37]

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py
File pydir/run-llvm2ice.py (right):

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py#ne...
pydir/run-llvm2ice.py:13: desc = 'Run the llvm2ice compiler on a llvm file.'
You should probably use a docstring here, like in szbuild.py.

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py#ne...
pydir/run-llvm2ice.py:29: help="Don't keep local symbols in the PEXE file")
Maybe lowercase 'pexe' for consistency with pexe and llvm?

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py#ne...
pydir/run-llvm2ice.py:82: cmd.append(llfile)
Maybe use
  cmd += [llfile]
for consistency?

https://codereview.chromium.org/600043002/diff/20001/tests_lit/lit.cfg
File tests_lit/lit.cfg (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/lit.cfg#newcode61
tests_lit/lit.cfg:61: # Note: l2i should is prefered over lc2i, since it uses
PNaCl bitcode.
remove "should", spell-check "preferred"

[Karl, 2014-09-24 21:01:22]

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py
File pydir/run-llvm2ice.py (right):

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py#ne...
pydir/run-llvm2ice.py:13: desc = 'Run the llvm2ice compiler on a llvm file.'
On 2014/09/24 20:37:36, stichnot wrote:
> You should probably use a docstring here, like in szbuild.py.

Done.

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py#ne...
pydir/run-llvm2ice.py:26: help='Stop afer translating to Subzero instructions')
On 2014/09/24 20:35:19, jvoung wrote:
> after

Done.

https://codereview.chromium.org/600043002/diff/20001/pydir/run-llvm2ice.py#ne...
pydir/run-llvm2ice.py:29: help="Don't keep local symbols in the PEXE file")
On 2014/09/24 20:37:36, stichnot wrote:
> Maybe lowercase 'pexe' for consistency with pexe and llvm?

Done.

https://codereview.chromium.org/600043002/diff/20001/tests_lit/lit.cfg
File tests_lit/lit.cfg (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/lit.cfg#newcode61
tests_lit/lit.cfg:61: # Note: l2i should is prefered over lc2i, since it uses
PNaCl bitcode.
On 2014/09/24 20:35:19, jvoung wrote:
> should is preferred -> should be preferred

Acknowledged.

https://codereview.chromium.org/600043002/diff/20001/tests_lit/lit.cfg#newcode61
tests_lit/lit.cfg:61: # Note: l2i should is prefered over lc2i, since it uses
PNaCl bitcode.
On 2014/09/24 20:37:36, stichnot wrote:
> remove "should", spell-check "preferred"

Done.

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
File tests_lit/llvm2ice_tests/load.ll (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
tests_lit/llvm2ice_tests/load.ll:3: ; TODO(kschimpf) Find out why lc2i and
--llvm is needed.
On 2014/09/24 20:35:19, jvoung wrote:
> nit: --llvm is not visible here?

Removed.

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
File tests_lit/llvm2ice_tests/switch-opt.ll (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
tests_lit/llvm2ice_tests/switch-opt.ll:6: ; RUN: %p2i -i %s -a  --verbose none |
FileCheck --check-prefix=ERRORS %s
On 2014/09/24 20:35:19, jvoung wrote:
> nit: extra space

Done.

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
tests_lit/llvm2ice_tests/switch-opt.ll:6: ; RUN: %p2i -i %s -a  --verbose none |
FileCheck --check-prefix=ERRORS %s
On 2014/09/24 20:35:19, jvoung wrote:
> nit: extra space

Done.

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
File tests_lit/llvm2ice_tests/unnamed.ll (right):

https://codereview.chromium.org/600043002/diff/20001/tests_lit/llvm2ice_tests...
tests_lit/llvm2ice_tests/unnamed.ll:3: ; RUN: %p2i -i %s --args -notranslate
-verbose=inst | FileCheck %s
On 2014/09/24 20:35:19, jvoung wrote:
> is this the same as --insts ?

Yes. Fixed.

[jvoung (off chromium), 2014-09-24 22:29:44]

lgtm

[Karl, 2014-09-25 16:37:59]

Committed patchset #4 (id:60001) manually as 2a5324a (presubmit successful).