Subzero: give crosstest .sz intermediate files names that depend on flags

crosstest/crosstest.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import re
 import subprocess
 import sys
 import tempfile
 
 sys.path.insert(0, '../pydir')
@@ skipping 64 matching lines @@
             f = open(bitcode)
             ll_lines = f.readlines()
             f.close()
             f = open(bitcode, 'w')
             for line in ll_lines:
                 line = remove_internal.sub('define ', line)
                 line = fix_target.sub('i686-pc-linux-gnu', line)
                 f.write(line)
             f.close()
 
-        asm_sz = os.path.join(args.dir, base + '.sz.s')
-        obj_sz = os.path.join(args.dir, base + '.sz.o')
+        base_sz = '%s.O%s.%s' % (base, args.optlevel, args.target)
+        asm_sz = os.path.join(args.dir, base_sz + '.sz.s')
+        obj_sz = os.path.join(args.dir, base_sz + '.sz.o')
         obj_llc = os.path.join(args.dir, base + '.llc.o')
         shellcmd(['../llvm2ice',
                   '-O' + args.optlevel,
                   '--target=' + args.target,
                   '--prefix=' + args.prefix,
                   '-o=' + asm_sz,
                   bitcode])
         shellcmd([os.path.join(llvm_bin_path, 'llvm-mc'),
                   '-arch=' + arch_map[args.target],
                   '-x86-asm-syntax=intel',
@@ skipping 21 matching lines @@
                       '-o=' + obj_llc,
                       bitcode])
             objs.append(obj_llc)
         else:
             objs.append(bitcode)
 
     linker = 'clang' if os.path.splitext(args.driver)[1] == '.c' else 'clang++'
     shellcmd([os.path.join(llvm_bin_path, linker), '-g', '-m32', args.driver] +
              objs +
              ['-lm', '-o', os.path.join(args.dir, args.output)])