AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hip-hcc codes: Part three

Browse Source 
1.Rename include/hip/hcc_detail/ as include/hip/amd_detail/

2.Rename include/hip/nvcc_detail/ as include/hip/nvidia_detail/

3.Create __HIP_PLATFORM_AMD__ to replace __HIP_PLATFORM_HCC__

4.Create __HIP_PLATFORM_NVIDIA__ to replace __HIP_PLATFORM_NVCC__

After hcc_detail, nvcc_detail, __HIP_PLATFORM_HCC__ and __HIP_PLATFORM_NVCC__
have been removed from upstream, they will be removed from hip runtime.

Change-Id: I1ae457effd739d6c25bca203c1724b026be21fce
This commit is contained in:
Tao Sang
2020-12-15 17:38:08 -05:00
committed by Tao Sang
parent 301d6d8f00
commit 693b89b3dd
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/1_Utils/hipCommander/hipCommander.cpp
+2 -2
View File
@@ -813,12 +813,12 @@ int main(int argc, char* argv[]) {
CommandStream* cs;
if (p_blockingSync) {
#ifdef __HIP_PLATFORM_HCC__
#ifdef __HIP_PLATFORM_AMD__
printf("setting BlockingSync for AMD\n");
setenv("HIP_BLOCKING_SYNC", "1", 1);
#endif
#ifdef __HIP_PLATFORM_NVCC__
#ifdef __HIP_PLATFORM_NVIDIA__
printf("setting cudaDeviceBlockingSync\n");
HIPCHECK(hipSetDeviceFlags(cudaDeviceBlockingSync));
#endif
samples/1_Utils/hipDispatchLatency/hipDispatchEnqueueRateMT.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ THE SOFTWARE.
#include <stdio.h>
#include "hip/hip_runtime.h"
#ifdef __HIP_PLATFORM_HCC__
#ifdef __HIP_PLATFORM_AMD__
#include "hip/hip_ext.h"
#endif
#include <iostream>
samples/1_Utils/hipDispatchLatency/hipDispatchLatency.cpp
+2 -2
View File
@@ -18,7 +18,7 @@ THE SOFTWARE.
*/
#include "hip/hip_runtime.h"
#ifdef __HIP_PLATFORM_HCC__
#ifdef __HIP_PLATFORM_AMD__
#include "hip/hip_ext.h"
#endif
#include <iostream>
@@ -109,7 +109,7 @@ int main() {
/***********************************************************************************/
//Timing directly the dispatch
#if defined(__HIP_PLATFORM_HCC__) && GENERIC_GRID_LAUNCH == 1 && defined(__HCC__)
#if defined(__HIP_PLATFORM_AMD__) && GENERIC_GRID_LAUNCH == 1 && defined(__HCC__)
for (auto i = 0; i < TOTAL_RUN_COUNT; ++i) {
hipExtLaunchKernelGGL((EmptyKernel), dim3(NUM_GROUPS), dim3(GROUP_SIZE), 0, stream0, start, stop, 0);
hipEventSynchronize(stop);
samples/1_Utils/hipInfo/README.md
+1 -1
View File
@@ -3,4 +3,4 @@
Simple tool that prints properties for each device (from hipGetDeviceProperties), and compiler info.
Properties includes all of the architectural feature flags for each device.
Also demonstrates how to use platform-specific compilation path (testing `__HIP_PLATFORM_NVCC__` or `__HIP_PLATFORM_HCC__`)
Also demonstrates how to use platform-specific compilation path (testing `__HIP_PLATFORM_AMD__` or `__HIP_PLATFORM_NVIDIA__`)
samples/1_Utils/hipInfo/hipInfo.cpp
+1 -1
View File
@@ -171,7 +171,7 @@ void printDeviceProp(int deviceId) {
cout << endl;
#ifdef __HIP_PLATFORM_NVCC__
#ifdef __HIP_PLATFORM_NVIDIA__
// Limits:
cout << endl;
printLimit(w1, cudaLimitStackSize, "bytes/thread");