Subzero: Make threads=2 and filetype=obj the testing defaults.

Change crosstest.py's -elf argument to the now-standard -filetype and just pass it through to llvm2ice. This also fixes a leftover -elf-writer argument that should have been changed to -filetype=obj. It would be nice to change all the explicit -threads=0 to -threads=1 in the lit tests, but that uncovers too many assumptions about dump/emit output order, or ordering between function and global data emission. BUG= none R=kschimpf@google.com Review URL: https://codereview.chromium.org/924023002

Subzero: Make threads=2 and filetype=obj the testing defaults.
9f76aec7 · Jim Stichnoth · 7b300674 · 9f76aec7 · 9f76aec7 · 9f76aec7
Commit 9f76aec7 authored Feb 13, 2015 by Jim Stichnoth
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

crosstest.py pydir/crosstest.py +7 -7

llvm2ice.cpp src/llvm2ice.cpp +1 -1

globalrelocs.ll tests_lit/llvm2ice_tests/globalrelocs.ll +1 -1

No files found.
--- a/pydir/crosstest.py
+++ b/pydir/crosstest.py
@@ -65,9 +65,9 @@ if __name__ == '__main__':
                           'from the same bitcode as the subzero object. ' +
                           'If 0, then compile it straight from source.' +
                           ' Default %(default)d.')
-    argparser.add_argument('--elf', dest='elf',
+    argparser.add_argument('--filetype', default='obj', dest='filetype',
-                           action='store_true',
+                           choices=['obj', 'asm', 'iasm'],
-                           help='Directly generate ELF output')
+                           help='Output file type.  Default %(default)s.')
    args = argparser.parse_args()
    nacl_root = FindBaseNaCl()
@@ -108,10 +108,10 @@ if __name__ == '__main__':
                  '--target=' + args.target,
                  '--prefix=' + args.prefix,
                  '-allow-uninitialized-globals',
-                  '-o=' + (obj_sz if args.elf else asm_sz),
+                  '-filetype=' + args.filetype,
-                  bitcode] +
+                  '-o=' + (obj_sz if args.filetype == 'obj' else asm_sz),
-                 (['-elf-writer'] if args.elf else []))
+                  bitcode])
-        if not args.elf:
+        if args.filetype != 'obj':
            shellcmd(['llvm-mc',
                      '-arch=' + arch_map[args.target],
                      '-filetype=obj',

--- a/src/llvm2ice.cpp
+++ b/src/llvm2ice.cpp
@@ -211,7 +211,7 @@ static cl::opt<uint32_t> NumThreads(
    cl::desc("Number of translation threads (0 for purely sequential)"),
    // TODO(stichnot): Settle on a good default.  Consider
    // something related to std::thread::hardware_concurrency().
-    cl::init(0));
+    cl::init(2));
 static int GetReturnValue(int Val) {
  if (AlwaysExitSuccess)

--- a/tests_lit/llvm2ice_tests/globalrelocs.ll
+++ b/tests_lit/llvm2ice_tests/globalrelocs.ll
@@ -262,5 +262,5 @@ define void @func() {
  ret void
 }
-; CHECK: define void @func() {
+; DUMP: define void @func() {