From 8ea836017a895833a745e5e72bd54035898d686a Mon Sep 17 00:00:00 2001
From: Mark Searles <mark.searles@amd.com>
Date: Wed, 21 Nov 2018 10:03:16 -0800
Subject: [PATCH] Force object code v2 until v3 is supported

Change-Id: I4c2a64bf9bd515686d1f1d90aece2a9ac40e5685
---
 rocrtst/Kernels/CMakeLists.txt            | 4 ++--
 rocrtst/samples/CMakeLists.txt            | 2 +-
 rocrtst/suites/test_common/CMakeLists.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rocrtst/Kernels/CMakeLists.txt b/rocrtst/Kernels/CMakeLists.txt
index 408e94c19c..3b2064f364 100644
--- a/rocrtst/Kernels/CMakeLists.txt
+++ b/rocrtst/Kernels/CMakeLists.txt
@@ -111,12 +111,12 @@ function(CompileKernel KRNL_NAME TARGET_DEV)
   # asm files
   #
   string(CONCAT CODE_ARG_STR "-Xclang -finclude-default-header "
-                "-target amdgcn-amdh-amdhsa -mcpu=${TARGET_DEV} "
+                "-target amdgcn-amdh-amdhsa -mcpu=${TARGET_DEV} -mno-code-object-v3 "
                 "${COMMON_BITCODE_LIB1} ${COMMON_BITCODE_LIB2} "
                 "${COMMON_BITCODE_LIB3} -cl-std=CL${OPENCL_VER} "
                 "${PROJECT_SOURCE_DIR}/${CL_FILE} -o ${KERNEL_DIR}/${CODEOBJ_FILE}")
   string(CONCAT ASM_ARG_STR "-S -Xclang -finclude-default-header "
-                "-target amdgcn-amdh-amdhsa -mcpu=${TARGET_DEV} "
+                "-target amdgcn-amdh-amdhsa -mcpu=${TARGET_DEV} -mno-code-object-v3 "
                 "${COMMON_BITCODE_LIB1} ${COMMON_BITCODE_LIB2} "
                 "${COMMON_BITCODE_LIB3} -cl-std=CL${OPENCL_VER} "
                 "${PROJECT_SOURCE_DIR}/${CL_FILE} -o ${KERNEL_DIR}/${CODEASM_FILE}")
diff --git a/rocrtst/samples/CMakeLists.txt b/rocrtst/samples/CMakeLists.txt
index e9cd4f99a4..7daf4819b1 100755
--- a/rocrtst/samples/CMakeLists.txt
+++ b/rocrtst/samples/CMakeLists.txt
@@ -237,7 +237,7 @@ function(process_sample S_NAME TARG_DEV HAS_KERNEL)
   if (${HAS_KERNEL})
     # Build the kernel
     separate_arguments(CLANG_ARG_LIST UNIX_COMMAND
-     "-x cl -Xclang -finclude-default-header -target amdgcn-amdh-amdhsa -mcpu=${TARG_DEV} ${BITCODE_LIBS} -cl-std=CL${OPENCL_VER} ${CL_FILE_LIST} -o ${KERNEL_DIR}/${SNAME_KERNEL}")
+     "-x cl -Xclang -finclude-default-header -target amdgcn-amdh-amdhsa -mcpu=${TARG_DEV} -mno-code-object-v3 ${BITCODE_LIBS} -cl-std=CL${OPENCL_VER} ${CL_FILE_LIST} -o ${KERNEL_DIR}/${SNAME_KERNEL}")
     add_custom_target("${TARG_NAME}" ${CLANG} ${CLANG_ARG_LIST} COMMAND
       ${CMAKE_COMMAND} -E create_symlink
         "../${SNAME_EXE}" "${KERNEL_DIR}/${SNAME_EXE}"
diff --git a/rocrtst/suites/test_common/CMakeLists.txt b/rocrtst/suites/test_common/CMakeLists.txt
index 7061514e99..78fe400124 100755
--- a/rocrtst/suites/test_common/CMakeLists.txt
+++ b/rocrtst/suites/test_common/CMakeLists.txt
@@ -265,7 +265,7 @@ function(build_kernel S_NAME TARG_DEV)
   set(HSACO_TARG_LIST ${HSACO_TARG_LIST} ${TARG_NAME}
                                                  CACHE INTERNAL HSA_TARG_LIST)
   separate_arguments(CLANG_ARG_LIST UNIX_COMMAND
-   "-x cl -Xclang -finclude-default-header -target amdgcn-amdh-amdhsa -mcpu=${TARG_DEV} ${BITCODE_LIBS} -cl-std=CL${OPENCL_VER} ${CL_FILE_LIST} -o ${KERNEL_DIR}/${SNAME_KERNEL}")
+   "-x cl -Xclang -finclude-default-header -target amdgcn-amdh-amdhsa -mcpu=${TARG_DEV} -mno-code-object-v3 ${BITCODE_LIBS} -cl-std=CL${OPENCL_VER} ${CL_FILE_LIST} -o ${KERNEL_DIR}/${SNAME_KERNEL}")
   add_custom_target("${TARG_NAME}" ${CLANG} ${CLANG_ARG_LIST} COMMAND
       ${CMAKE_COMMAND} -E create_symlink
         "../${ROCRTST}" "${KERNEL_DIR}/${ROCRTST}"