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

include/hip/hip_runtime.h

@@ -23,7 +23,7 @@ THE SOFTWARE.
 //! HIP = Heterogeneous-compute Interface for Portability
 //!
 //! Define a extremely thin runtime layer that allows source code to be compiled unmodified
-//! through either AMD HCC or NVCC.   Key features tend to be in the spirit
+//! through either AMD CLANG or NVCC.   Key features tend to be in the spirit
 //! and terminology of CUDA, but with a portable path to other accelerators as well:
 //
 //! Both paths support rich C++ features including classes, templates, lambdas, etc.
@@ -64,6 +64,46 @@ THE SOFTWARE.
 #error("Must define exactly one of __HIP_PLATFORM_AMD__ or __HIP_PLATFORM_NVIDIA__");
 #endif
 
+// The following are deprecation notices.
+// They will be removed after upstream updation.
+#if defined(__clang__)
+//The following work for clang rather than for gnu gcc/g++/c++
+#pragma GCC diagnostic push
+#pragma GCC diagnostic warning "-Wcpp"
+#ifdef __HCC__
+#warning("__HCC__ is deprecated, please don't use it")
+#endif
+
+#ifdef __HIP_ROCclr__
+#warning("__HIP_ROCclr__ is deprecated, please don't use it")
+#endif
+
+#ifdef __HIP_PLATFORM_HCC__
+#warning("__HIP_PLATFORM_HCC__ is deprecated, please use __HIP_PLATFORM_AMD__ instead")
+#endif
+
+#ifdef __HIP_PLATFORM_NVCC_
+#warning("__HIP_PLATFORM_NVCC_ is deprecated, please use __HIP_PLATFORM_NVIDIA__ instead")
+#endif
+#pragma GCC diagnostic pop
+#elif defined(__GNUC__)
+//The following work for gnu gcc/g++/c++ rather than for clang
+#ifdef __HCC__
+#pragma message ("__HCC__ is deprecated, please don't use it")
+#endif
+
+#ifdef __HIP_ROCclr__
+#pragma message ("__HIP_ROCclr__ is deprecated, please don't use it")
+#endif
+
+#ifdef __HIP_PLATFORM_HCC__
+#pragma message ("__HIP_PLATFORM_HCC__ is deprecated, please use __HIP_PLATFORM_AMD__ instead")
+#endif
+
+#ifdef __HIP_PLATFORM_NVCC_
+#pragma message ("__HIP_PLATFORM_NVCC_ is deprecated, please use __HIP_PLATFORM_NVIDIA__ instead")
+#endif
+#endif // defined(__clang__)
 
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_vector_types.h>