From 71bfa205084a85e98e2a7845de7df0a618e5381d Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Tue, 2 Feb 2016 10:02:48 -0600
Subject: [PATCH] Remove warning on ballot/any/all and pop/clz.

Since these are supported in HIP no reason to emit warnings.


[ROCm/clr commit: 182296ce597c6ecc917e437ffcfe1d8bc2962d45]
---
 projects/clr/hipamd/bin/hipify               | 10 +++++-----
 projects/clr/hipamd/tests/src/CMakeLists.txt | 13 +++++++++++++
 projects/clr/hipamd/tests/src/specialFunc.cu | 11 +++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 projects/clr/hipamd/tests/src/specialFunc.cu

diff --git a/projects/clr/hipamd/bin/hipify b/projects/clr/hipamd/bin/hipify
index 3eecc12abb..e5f17b69d0 100755
--- a/projects/clr/hipamd/bin/hipify
+++ b/projects/clr/hipamd/bin/hipify
@@ -624,12 +624,12 @@ sub warnUnsupportedSpecialFunctions
         "__ldg",
 
         # Cross-lane and warp-vote instructions:
-        "__all",
-        "__any",
-        "__ballot",
+        #"__all",
+        #"__any",
+        #"__ballot",
 
-        "__popc",
-        "__clz",        
+        #"__popc",
+        #"__clz",        
 
         "__shfl",
         "__shfl_up",  
diff --git a/projects/clr/hipamd/tests/src/CMakeLists.txt b/projects/clr/hipamd/tests/src/CMakeLists.txt
index 3f2396b315..c1df4f376f 100644
--- a/projects/clr/hipamd/tests/src/CMakeLists.txt
+++ b/projects/clr/hipamd/tests/src/CMakeLists.txt
@@ -75,6 +75,7 @@ macro (make_hip_executable exe cpp)
     endif() 
 endmacro()
 
+
 macro (make_test exe )
   string (REPLACE " " "" smush_args ${ARGN})
   set (testname ${exe}${smush_args}.tst)
@@ -87,6 +88,16 @@ macro (make_test exe )
 endmacro()
 
 
+macro (make_hipify_test sourceFile )
+    #string (REPLACE " " "" smush_args ${ARGN})
+  set (testname ${sourceFile}${smush_args}.tst)
+
+  add_test (NAME ${testname} 
+      COMMAND ${HIP_PATH}/bin/hipify ${PROJECT_SOURCE_DIR}/${sourceFile} ${ARGN} 
+            )
+endmacro()
+
+
 macro (make_test_matches exe match_string)
   string (REPLACE " " "" smush_args ${ARGN})
   set (testname ${exe}${smush_args}.tst)
@@ -133,3 +144,5 @@ make_test(hipGridLaunch " " )
 make_test(hipMemcpy  " " )
 
 make_test(hipHcc  " " )
+
+make_hipify_test(specialFunc.cu )
diff --git a/projects/clr/hipamd/tests/src/specialFunc.cu b/projects/clr/hipamd/tests/src/specialFunc.cu
new file mode 100644
index 0000000000..c5c1931024
--- /dev/null
+++ b/projects/clr/hipamd/tests/src/specialFunc.cu
@@ -0,0 +1,11 @@
+//Test to ensure hipify runs correctly.
+// Hipify may report warnings for some missing/unsupported functions
+
+void __global__
+test_kernel(float *A) 
+{
+    int tid = blockIdx.x * blockDim.x + threadIdx.x;
+
+    float a = __ballot(tid < 16);
+    float b = __shfl(tid < 16);
+}