Remove hip-hcc codes: Part four

Remove __HCC__, __HCC_ONLY__, __HCC_CPP__, __HCC_C__,
__HCC_OR_HIP_CLANG__, __HIP_ROCclr__ and their guarded codes.

Remove Hcc codes from directed_tests and samples.

Remove __HIP_PLATFORM_HCC__ and __HIP_PLATFORM_NVCC__ from
some files where they are not necessary.

Add deprecation notice.

Change-Id: I1ae467eafd749d6c25bca204c1724b026be21fce

tests/src/deviceLib/hipLaunchKernelFunc.cpp

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp HCC_OPTIONS -Xclang -fallow-half-arguments-and-returns CLANG_OPTIONS -Xclang -fallow-half-arguments-and-returns EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../test_common.cpp CLANG_OPTIONS -Xclang -fallow-half-arguments-and-returns EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */

tests/src/deviceLib/hipMathFunctions.cpp

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp HCC_OPTIONS -Xclang -fallow-half-arguments-and-returns CLANG_OPTIONS -Xclang -fallow-half-arguments-and-returns EXCLUDE_HIP_PLATFORM nvidia
+ * BUILD: %t %s ../test_common.cpp CLANG_OPTIONS -Xclang -fallow-half-arguments-and-returns EXCLUDE_HIP_PLATFORM nvidia
  * TEST: %t
  * HIT_END
  */

tests/src/deviceLib/hipStdComplex.cpp

@@ -151,11 +151,8 @@ void test() {
 }
 
 int main() {
-// ToDo: Fix bug in HCC causing linking error at -O0.
-#ifndef __HCC__
   test<float>();
   test<double>();
-#endif
   passed();
   return 0;
 }

tests/src/deviceLib/hipTestDotFunctions.cpp

@@ -32,7 +32,7 @@ THE SOFTWARE.
 
 
 __global__ void DotFunctions(bool* result) {
-    #if (__hcc_workweek__ >= 19015) || __HIP_CLANG_ONLY__
+    #if __HIP_CLANG_ONLY__
     // Dot Functions
     short2 sa{1}, sb{1};
     result[0] = amd_mixed_dot(sa, sb, 1, result[0]) && result[0];

tests/src/deviceLib/hipTestNativeHalf.cpp

@@ -155,7 +155,7 @@ void __half2Test(bool* result, __half2 a) {
     result[0] = !(a < a) && result[0];
     result[0] = !(a > a) && result[0];
 
-    #if (__hcc_workweek__ >= 19015) || __HIP_CLANG_ONLY__
+    #if __HIP_CLANG_ONLY__
     // Dot Functions
     result[0] = amd_mixed_dot(a, a, 1, 1) && result[0];
     #endif

tests/src/deviceLib/hip_test_ldg.cpp

@@ -35,7 +35,7 @@ THE SOFTWARE.
 #include "hip/hip_vector_types.h"
 #include "test_common.h"
 
-#if (__hcc_workweek__ >= 16164) || defined(__HIP_PLATFORM_NVIDIA__) || defined(__HIP_CLANG_ONLY__)
+#if defined(__HIP_PLATFORM_NVIDIA__) || defined(__HIP_CLANG_ONLY__)
 
 #define HIP_ASSERT(x) (assert((x) == hipSuccess))
 

tests/src/hipHcc.cpp

@@ -48,15 +48,5 @@ int main(int argc, char* argv[]) {
     CHECK(hipGetDeviceProperties(&props, deviceId));
     printf("info: running on device #%d %s\n", deviceId, props.name);
 
-#ifdef __HCC__
-    hc::accelerator acc;
-    CHECK(hipHccGetAccelerator(deviceId, &acc));
-    std::wcout << "device_path=" << acc.get_device_path() << "\n";
-
-    hc::accelerator_view* av;
-    CHECK(hipHccGetAcceleratorView(0 /*nullStream*/, &av));
-#endif
-
-
     passed();
 };

tests/src/hostcall/hipHostcallFuncCall.cpp

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/hostcall/hipHostcallPrintThings.cpp

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/kernel/hipDynamicShared.cpp

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME hcc
+ * BUILD: %t %s ../test_common.cpp
  * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */

tests/src/kernel/hipDynamicShared2.cpp

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME hcc
+ * BUILD: %t %s ../test_common.cpp
  * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */

tests/src/kernel/hipLanguageExtensions.cpp

@@ -31,10 +31,6 @@ THE SOFTWARE.
 
 #include <test_common.h>
 
-#ifdef __HCC__
-#include <hc.hpp>
-#endif
-
 // cudaA
 
 // Simple tests for variable type qualifiers:
@@ -89,14 +85,6 @@ __global__ void vectorADD(T __restrict__* A_d, T* B_d, T* C_d, size_t N) {
     float fastZ = __sin(x);
 #endif
 
-#ifdef __HCC__
-
-    int b = threadIdx.x;
-    int c;
-
-    atomicAdd(&c, b);
-#endif
-
     __syncthreads();
 
 

tests/src/printf/hipPrintfAltForms.cpp

@@ -21,8 +21,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/printf/hipPrintfBasic.cpp

@@ -21,8 +21,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/printf/hipPrintfFlags.cpp

@@ -21,8 +21,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/printf/hipPrintfManyDevices.cpp

@@ -21,8 +21,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/printf/hipPrintfManyWaves.cpp

@@ -21,8 +21,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/printf/hipPrintfSpecifiers.cpp

@@ -21,8 +21,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/printf/hipPrintfStar.cpp

@@ -21,8 +21,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/printf/hipPrintfWidthPrecision.cpp

@@ -21,8 +21,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
- * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia
+ * TEST: %t EXCLUDE_HIP_PLATFORM nvidia
  * HIT_END
  */
 

tests/src/runtimeApi/memory/hipMemcpy3D.cpp

@@ -39,7 +39,7 @@ void runTest(int width,int height,int depth, hipChannelFormatKind formatKind)
             }
         }
     }
-    printf("test- sizeof(T) =%d\n", sizeof(T));
+    printf("test- sizeof(T) =%zu\n", sizeof(T));
     hipChannelFormatDesc channelDesc = hipCreateChannelDesc(sizeof(T)*8, 0, 0, 0, formatKind);
     hipArray *arr,*arr1;
 

tests/src/runtimeApi/memory/p2p_copy_coherency.cpp

@@ -32,14 +32,6 @@ THE SOFTWARE.
 #include "hip/hip_runtime.h"
 #include "test_common.h"
 
-#define USE_HCC_MEMTRACKER 0 /* Debug flag to show the memtracker periodically */
-
-#if defined(__HIP_PLATFORM_AMD__) && !defined(__HIP_ROCclr__)
-#include <hc_am.hpp>
-#else
-#define USE_HCC_MEMTRACKER 0
-#endif
-
 int elementSizes[] = {1, 16, 1024, 524288, 16 * 1000 * 1000};
 int nSizes = sizeof(elementSizes) / sizeof(int);
 
@@ -166,10 +158,6 @@ void testMultiGpu(int dev0, int dev1, int numElements, bool hostSync) {
     HIPCHECK(hipHostMalloc(&dataHost, sizeElements));
     memset(dataHost, 13, sizeElements);
 
-#if USE_HCC_MEMTRACKER
-    hc::am_memtracker_print(0x0);
-#endif
-
     printf("  test: init complete\n");
     runTestImpl(true, hostSync, gpu0Stream, gpu1Stream, numElements, dataGpu0_0, dataGpu0_1,
                 dataGpu1, dataHost, expected);