merge amd-stg-open into amd-mainline-open

Change-Id: I89777c216127bd7f5e4592199d9c6c3e936bd541
ROCm · Dec 2, 2021 · d8171e7 · d8171e7
2 parents 8e4c100 + 73075fe
commit d8171e7
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 1,491 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,8 +52,6 @@ if (NOT DEFINED AMDGPU_TARGET_TRIPLE)
   set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa")
 endif()
 
-option(BUILD_HC_LIB "Build Heterogeneous Compute built-in library (hc)" ON)
-
 if (NOT PREPARE_BUILTINS)
   add_subdirectory(utils/prepare-builtins)
   set (PREPARE_BUILTINS $<TARGET_FILE:prepare-builtins>)
@@ -71,10 +69,6 @@ add_subdirectory(opencl)
 add_subdirectory(hip)
 add_subdirectory(asanrtl)
 
-if(BUILD_HC_LIB)
-  add_subdirectory(hc)
-endif()
-
 enable_testing()
 add_subdirectory(test/constant_folding)
 

diff --git a/asanrtl/src/preserve.cl b/asanrtl/src/preserve.cl
@@ -63,8 +63,8 @@ extern void __sanitizer_ptr_cmp(uptr a, uptr b);
 extern void __sanitizer_ptr_sub(uptr a, uptr b);
 extern void __asan_before_dynamic_init(uptr addr);
 extern void __asan_after_dynamic_init(void);
-extern void __asan_register_globals(void *start, uptr n);
-extern void __asan_unregister_globals(void *start, uptr n);
+extern void __asan_register_globals(uptr start, uptr n);
+extern void __asan_unregister_globals(uptr start, uptr n);
 extern void __asan_register_image_globals(uptr flag);
 extern void __asan_unregister_image_globals(uptr flag);
 extern void __asan_register_elf_globals(uptr flag, uptr start, uptr stop);

diff --git a/hc/CMakeLists.txt b/hc/CMakeLists.txt
diff --git a/hc/src/hc_amdgcn.ll b/hc/src/hc_amdgcn.ll