Renaming ROCm with HIP

- Change from intel/llvm#4418

Author: dongkyunahn-intel

SYCL/FilterSelector/select.cpp

@@ -39,7 +39,7 @@ int main() {
   bool HasLevelZeroDevices = false;
   bool HasOpenCLDevices = false;
   bool HasCUDADevices = false;
-  bool HasROCmDevices = false;
+  bool HasHIPDevices = false;
   bool HasOpenCLGPU = false;
   bool HasLevelZeroGPU = false;
 
@@ -51,8 +51,8 @@ int main() {
       HasOpenCLDevices = true;
     } else if (Backend == backend::cuda) {
       HasCUDADevices = true;
-    } else if (Backend == backend::rocm) {
-      HasROCmDevices = true;
+    } else if (Backend == backend::hip) {
+      HasHIPDevices = true;
     }
   }
 
@@ -67,7 +67,7 @@ int main() {
   std::cout << "HasLevelZeroDevices = " << HasLevelZeroDevices << std::endl;
   std::cout << "HasOpenCLDevices    = " << HasOpenCLDevices << std::endl;
   std::cout << "HasCUDADevices      = " << HasCUDADevices << std::endl;
-  std::cout << "HasROCmDevices      = " << HasROCmDevices << std::endl;
+  std::cout << "HasHIPDevices      = " << HasHIPDevices << std::endl;
   std::cout << "HasOpenCLGPU        = " << HasOpenCLGPU << std::endl;
   std::cout << "HasLevelZeroGPU     = " << HasLevelZeroGPU << std::endl;
 
@@ -202,15 +202,15 @@ int main() {
     std::cout << "...PASS" << std::endl;
   }
 
-  if (HasROCmDevices) {
-    std::cout << "Test 'rocm'";
-    device d19(ext::oneapi::filter_selector("rocm"));
-    assert(d19.get_platform().get_backend() == backend::rocm);
+  if (HasHIPDevices) {
+    std::cout << "Test 'hip'";
+    device d19(ext::oneapi::filter_selector("hip"));
+    assert(d19.get_platform().get_backend() == backend::hip);
     std::cout << "...PASS" << std::endl;
 
-    std::cout << "test 'rocm:gpu'";
-    device d20(ext::oneapi::filter_selector("rocm:gpu"));
-    assert(d20.is_gpu() && d19.get_platform().get_backend() == backend::rocm);
+    std::cout << "test 'hip:gpu'";
+    device d20(ext::oneapi::filter_selector("hip:gpu"));
+    assert(d20.is_gpu() && d19.get_platform().get_backend() == backend::hip);
     std::cout << "...PASS" << std::endl;
   }
 

SYCL/lit.cfg.py

@@ -157,7 +157,7 @@
 # Mapping from SYCL_BE backend definition style to SYCL_DEVICE_FILTER used
 # for backward compatibility
 try:
-  config.sycl_be = { 'PI_OPENCL': 'opencl',  'PI_CUDA': 'cuda', 'PI_ROCM': 'rocm', 'PI_LEVEL_ZERO': 'level_zero'}[config.sycl_be]
+  config.sycl_be = { 'PI_OPENCL': 'opencl',  'PI_CUDA': 'cuda', 'PI_HIP': 'hip', 'PI_LEVEL_ZERO': 'level_zero'}[config.sycl_be]
 except:
   # do nothing a we expect that new format of plugin values are used
   pass
@@ -171,19 +171,19 @@
 if config.dump_ir_supported:
    config.available_features.add('dump_ir')
 
-if config.sycl_be not in ['host', 'opencl', 'cuda', 'rocm', 'level_zero']:
+if config.sycl_be not in ['host', 'opencl', 'cuda', 'hip', 'level_zero']:
    lit_config.error("Unknown SYCL BE specified '" +
                     config.sycl_be +
-                    "' supported values are opencl, cuda, rocm, level_zero")
+                    "' supported values are opencl, cuda, hip, level_zero")
 
-# If ROCM_PLATFORM flag is not set, default to AMD, and check if ROCM platform is supported
-supported_rocm_platforms=["AMD", "NVIDIA"]
-if config.rocm_platform == "":
-    config.rocm_platform = "AMD"
-if config.rocm_platform not in supported_rocm_platforms:
-    lit_config.error("Unknown ROCm platform '" + config.rocm_platform + "' supported platforms are " + ', '.join(supported_rocm_platforms))
+# If HIP_PLATFORM flag is not set, default to AMD, and check if HIP platform is supported
+supported_hip_platforms=["AMD", "NVIDIA"]
+if config.hip_platform == "":
+    config.hip_platform = "AMD"
+if config.hip_platform not in supported_hip_platforms:
+    lit_config.error("Unknown HIP platform '" + config.hip_platform + "' supported platforms are " + ', '.join(supported_hip_platforms))
 
-if config.sycl_be == "rocm" and config.rocm_platform == "AMD":
+if config.sycl_be == "hip" and config.hip_platform == "AMD":
     arch_flag = '-Xsycl-target-backend=amdgcn-amd-amdhsa-sycldevice --offload-arch=' + config.amd_arch
 else:
     arch_flag = ""
@@ -303,9 +303,9 @@
 config.substitutions.append( ('%ACC_RUN_PLACEHOLDER',  acc_run_substitute) )
 config.substitutions.append( ('%ACC_CHECK_PLACEHOLDER',  acc_check_substitute) )
 
-if config.sycl_be == 'cuda' or (config.sycl_be == 'rocm' and config.rocm_platform == 'NVIDIA'):
+if config.sycl_be == 'cuda' or (config.sycl_be == 'hip' and config.hip_platform == 'NVIDIA'):
     config.substitutions.append( ('%sycl_triple',  "nvptx64-nvidia-cuda-sycldevice" ) )
-elif config.sycl_be == 'rocm' and config.rocm_platform == 'AMD':
+elif config.sycl_be == 'hip' and config.hip_platform == 'AMD':
     config.substitutions.append( ('%sycl_triple',  "amdgcn-amd-amdhsa-sycldevice" ) )
 else:
     config.substitutions.append( ('%sycl_triple',  "spir64-unknown-unknown-sycldevice" ) )