Python3 support: print-statement

[michaelplatings]

LNTBased/lib/spec.py

113 ↗

(On Diff #185276)

Should be end=' '

test-suite/trunk/ABI-Testsuite/linux-x86.py

 # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+from __future__ import print_function
 import os
 import sys
 wopt = " -w"
 test_params = {
     "bindump" : "nm",
     "runtool" : "", # if None, then runtool_func must exists
     "Platform" : "linux-gcc",
     "cxx_rtti" : "-frtti",   # option to enable rtti
def build_linker_name(cn):
   if (idx == (cnlen-5)): # ends in clang
     return cn + "++"
 
   return build_cxx_compiler_name(cn) # for gcc, linekr name is same as c++ compiler name
 
 
 import subprocess
 if __name__ == "__main__":
-  print sys.argv
+  print(sys.argv)
   litargs = [sys.argv[0]] # args for lit.main
   c_compiler_name = sys.argv[1].strip()
   cxx_compiler_name = build_cxx_compiler_name(c_compiler_name)
   linker_name = build_linker_name(c_compiler_name)
-  #print "C++ compiler:", cxx_compiler_name
-  #print "linker :", linker_name
+  #print("C++ compiler:", cxx_compiler_name)
+  #print("linker :", linker_name)
   for la in sys.argv[2:]:
     litargs.append(la)
   sys.argv = litargs
   cmd = c_compiler_name.split() + [ "-o", "b.exe", "test/common/genselector.c"]
-  #print "cmd = ", cmd
+  #print("cmd = ", cmd)
   rv = subprocess.call(cmd)
-  #print "rv = " , rv
+  #print("rv = " , rv)
   if rv != 0:
-    print "compiler failed: ", cmd
+    print("compiler failed: ", cmd)
     sys.exit(1)
   rv = subprocess.call("./b.exe")
   fp = open("nselector.h")
   fi = fp.read();
   fp.close()
   if ("LP64" in fi):
     test_params["Mode"] = "LP64-x86"
     prf = "--check-prefix=LP64"
   else:
     # 'gcc -m32' or 'clang -m32' mode
     test_params["Mode"] = "ILP32-x86"
     prf = "--check-prefix=ILP32"
   test_params["prefixes"] = prf;
   test_params["c_compiler"] = c_compiler_name
   test_params["cxx_compiler"] = cxx_compiler_name
   test_params["linker"] = linker_name
   test_params["Platform"] = "linux-" + cmd[0]
 
-  print "test_params = " , test_params
+  print("test_params = " , test_params)
   builtin_parameters = {
     'build_mode' : "Release",
     'llvm_site_config' : os.path.join(os.getcwd(), 'lit.site.cfg'),
     'clang_site_config': os.path.join(os.getcwd(), 'lit.site.cfg'),
     'test_params' : test_params
     }
-  #print "builtin_params = " , test_params
+  #print("builtin_params = " , test_params)
   from lit.main import main
   main(builtin_parameters)
 

test-suite/trunk/LNTBased/lib/spec.py

 #!/usr/bin/env python
 # -*- Python -*-
+from __future__ import print_function
 
 import os
 import shutil
 import stat
 
 # We import test functionity from LNT.
 from lnt.tests import nt
 from lnt.testing import TestSamples, PASS, FAIL, XFAIL
def run_safely(self, args, **kwargs):
         timeit.append(argstr)
         cmdstr = ' '.join(timeit)
 
         if self.config.remote:
             command_file = os.path.join(cwd, 'command_%d' % file_index)
             with open(command_file, 'w') as f:
                 # Chdir here so that the redirects are put into CWD as well.
                 remote_command = 'cd %s\n%s\n' % (cwd, cmdstr)
-                print >>self.log, "command:", remote_command,
+                print("command:", remote_command, file=self.log, end=' ')
                 f.write(remote_command)
 
             st = os.stat(command_file)
             os.chmod(command_file, st.st_mode | stat.S_IEXEC)
 
             res = self.call([self.config.remote_client,
                              '-l', self.config.remote_user,
                              self.config.remote_host,
def execute_test(self, options, make_variables, config):
         # test-suite-externals//speccpu2000/benchspec/CINT2000/164.gzip
         suitedir = os.path.join(TEST_SUITE_EXTERNALS, 'speccpu' + str(self.year), 'benchspec')
         if self.year == '2000':
             suitedir = os.path.join(suitedir, 'C%s2000' % self.category.upper())
         else:
             suitedir = os.path.join(suitedir, 'CPU' + self.year)
 
         self.datadir = os.path.join(suitedir, self.benchmark, 'data')
-        print >>self.log, "%s\n  options: %s\n\nmake variables: %s\n\n" % (self.testname, str(options), str(make_variables))
+        print("%s\n  options: %s\n\nmake variables: %s\n\n" % (self.testname, str(options), str(make_variables)), file=self.log)
 
         if not os.path.exists(self.datadir):
-            print >>self.log, "skipping, no source under externals"
+            print("skipping, no source under externals", file=self.log) 
             return []
 
         res = self.configure_test_suite(self.OBJROOT)
         if res != 0:
             return self.fail()
 
         make_cmd = ['make', '-k']
         make_cmd.extend('%s=%s' % (k,v) for k,v in make_variables.items())
def execute_test(self, options, make_variables, config):
             self.copy_input_set(pgo_dir, 'train')
 
             for (i, args) in enumerate(self.train_args):
                 pgo_cmd = './%s %s' % (self.exe, args)
                 (result, time) = self.run_safely(pgo_cmd, cwd=pgo_dir, shell=True, env=os.environ, file_index=i)
                 if result != 0:
                     return self.fail()
                 if not os.path.exists(os.path.join(pgo_dir, 'run_%d.profraw' % i)):
-                    print >>self.log, 'Failed to create PGO output'
+                    print('Failed to create PGO output', file=self.log)
                     return self.fail()
 
             llvm_profdata = os.path.join(os.path.dirname(CC), 'llvm-profdata')
             result = self.call(llvm_profdata + ' merge -output=code.profdata pgo/run_*.profraw', shell=True, cwd=self.OBJROOT)
             if result != 0:
                 return self.fail()
 
             target_flags = make_variables['TARGET_FLAGS'] + ' -fprofile-instr-use=' + os.path.join(self.OBJROOT, 'code.profdata')