Merge pull request #950 from emankov/master

[HIPIFY][tests] Update lit testing infrastructure

[ROCm/clr commit: 6b664dcf77]

projects/clr/hipamd/tests/hipify-clang/lit.cfg

@@ -3,6 +3,7 @@ import os
 import platform
 import re
 import subprocess
+import struct
 
 import lit.formats
 import lit.util
@@ -11,7 +12,14 @@ import lit.util
 site_cfg = lit_config.params.get('site_config', None)
 lit_config.load_config(config, site_cfg)
 
-print("CUDA " + config.cuda_version + " will be used for testing.")
+print(str("========================================"))
+print("CUDA " + config.cuda_version + " - will be used for testing")
+print("LLVM " + config.llvm_version + " - will be used for testing")
+print(platform.machine() + " - Platform architecture")
+print(platform.system() + " " + platform.release() + " - Platform OS")
+print(str(config.pointer_size * 8) + " - hipify-clang binary bitness")
+print(str(struct.calcsize("P") * 8) + " - python " + str(platform.python_version()) + " binary bitness")
+print(str("========================================"))
 
 config.excludes = ['cmdparser.hpp']
 config.excludes.append('spatial_batch_norm_op.h')
@@ -77,6 +85,8 @@ else:
     run_test_ext = ".sh"
     clang_arguments += " -isystem'%s'/samples/common/inc"
 clang_arguments += " -I'%s'/include"
+if config.pointer_size == 8:
+    clang_arguments += " -D__LP64__"
 
 hipify_arguments = "--cuda-path='%s'"
 

projects/clr/hipamd/tests/hipify-clang/lit.site.cfg.in

@@ -1,6 +1,8 @@
 import sys
 import os
 
+config.pointer_size = @CMAKE_SIZEOF_VOID_P@
+config.llvm_version = "@LLVM_PACKAGE_VERSION@"
 config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@"
 config.obj_root = "@CMAKE_CURRENT_BINARY_DIR@"
 config.cuda_root = "@CUDA_TOOLKIT_ROOT_DIR@"
@@ -32,4 +34,3 @@ except KeyError:
     e = sys.exc_info()[1]
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
-