From 59b6ffbe70adf57068697df93cbf3f76f87cd8ca Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Fri, 9 Sep 2016 12:01:41 +0530
Subject: [PATCH] Directed tests: hipDynamicShared now compiles on NVCC

NVCC does not support template in extern __shared__. Compilation is
fixed but test still does not run on NVCC.

Change-Id: I427c9170812401460d60ef8e3246525eeda38514
---
 tests/src/CMakeLists.txt       | 2 +-
 tests/src/hipDynamicShared.cpp | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt
index 0a2cd1321b..43a74910b2 100644
--- a/tests/src/CMakeLists.txt
+++ b/tests/src/CMakeLists.txt
@@ -214,11 +214,11 @@ endif()
 if (${HIP_PLATFORM} STREQUAL "hcc")
     make_test(hipArray " ")
     make_test(hipFuncSetDevice " ")
+    make_test(hipDynamicShared " ")
 endif()
 
 make_hipify_test(specialFunc.cu )
 
-make_test(hipDynamicShared " ")
 
 # Add subdirs here:
 add_subdirectory(context)
diff --git a/tests/src/hipDynamicShared.cpp b/tests/src/hipDynamicShared.cpp
index 329529281c..5686f9ee88 100644
--- a/tests/src/hipDynamicShared.cpp
+++ b/tests/src/hipDynamicShared.cpp
@@ -27,7 +27,12 @@ template<typename T>
 __global__ void testExternSharedKernel(hipLaunchParm lp, const T* A_d, const T* B_d, T* C_d, size_t numElements, size_t groupElements) {
 
     // declare dynamic shared memory
+#if defined(__HIP_PLATFORM_HCC__)
     HIP_DYNAMIC_SHARED(T, sdata)
+#else
+    HIP_DYNAMIC_SHARED(__align__(sizeof(T)) unsigned char, my_sdata)
+    T *sdata = reinterpret_cast<T *>(my_sdata);
+#endif
 
     size_t gid = (hipBlockIdx_x * hipBlockDim_x + hipThreadIdx_x);
     size_t tid = hipThreadIdx_x;