[HIPIFY][6.0.0] Support for ROCm HIP 6.0.0 - Step 1 - Data types

+ Updated synthetic tests, the regenerated hipify-perl, and docs
emankov · Oct 10, 2023 · 3ba72e8 · 3ba72e8
1 parent 4f19731
commit 3ba72e8
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 54 deletions.
diff --git a/bin/hipify-perl b/bin/hipify-perl
@@ -1076,7 +1076,22 @@ my %removed_funcs = (
 );
 
 my %experimental_funcs = (
-
+    "cudaExternalSemaphoreWaitNodeParamsV2" => "6.0.0",
+    "cudaExternalSemaphoreWaitNodeParams" => "6.0.0",
+    "cudaExternalSemaphoreSignalNodeParamsV2" => "6.0.0",
+    "cudaExternalSemaphoreSignalNodeParams" => "6.0.0",
+    "cudaDevAttrHostRegisterSupported" => "6.0.0",
+    "CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED" => "6.0.0",
+    "CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st" => "6.0.0",
+    "CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2" => "6.0.0",
+    "CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1" => "6.0.0",
+    "CUDA_EXT_SEM_WAIT_NODE_PARAMS_st" => "6.0.0",
+    "CUDA_EXT_SEM_WAIT_NODE_PARAMS" => "6.0.0",
+    "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2_st" => "6.0.0",
+    "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2" => "6.0.0",
+    "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1" => "6.0.0",
+    "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st" => "6.0.0",
+    "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS" => "6.0.0"
 );
 
 $print_stats = 1 if $examine;
@@ -1214,6 +1229,22 @@ sub subst {
 }
 
 sub experimentalSubstitutions {
+    subst("CUDA_EXT_SEM_SIGNAL_NODE_PARAMS", "hipExternalSemaphoreSignalNodeParams", "type");
+    subst("CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st", "hipExternalSemaphoreSignalNodeParams", "type");
+    subst("CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1", "hipExternalSemaphoreSignalNodeParams", "type");
+    subst("CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2", "hipExternalSemaphoreSignalNodeParams", "type");
+    subst("CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2_st", "hipExternalSemaphoreSignalNodeParams", "type");
+    subst("CUDA_EXT_SEM_WAIT_NODE_PARAMS", "hipExternalSemaphoreWaitNodeParams", "type");
+    subst("CUDA_EXT_SEM_WAIT_NODE_PARAMS_st", "hipExternalSemaphoreWaitNodeParams", "type");
+    subst("CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1", "hipExternalSemaphoreWaitNodeParams", "type");
+    subst("CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2", "hipExternalSemaphoreWaitNodeParams", "type");
+    subst("CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st", "hipExternalSemaphoreWaitNodeParams", "type");
+    subst("cudaExternalSemaphoreSignalNodeParams", "hipExternalSemaphoreSignalNodeParams", "type");
+    subst("cudaExternalSemaphoreSignalNodeParamsV2", "hipExternalSemaphoreSignalNodeParams", "type");
+    subst("cudaExternalSemaphoreWaitNodeParams", "hipExternalSemaphoreWaitNodeParams", "type");
+    subst("cudaExternalSemaphoreWaitNodeParamsV2", "hipExternalSemaphoreWaitNodeParams", "type");
+    subst("CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED", "hipDeviceAttributeHostRegisterSupported", "numeric_literal");
+    subst("cudaDevAttrHostRegisterSupported", "hipDeviceAttributeHostRegisterSupported", "numeric_literal");
 }
 
 sub rocSubstitutions {
@@ -7355,11 +7386,7 @@ sub warnUnsupportedFunctions {
         "cudaFlushGPUDirectRDMAWritesOptionMemOps",
         "cudaFlushGPUDirectRDMAWritesOptionHost",
         "cudaExternalSemaphoreWaitSkipNvSciBufMemSync",
-        "cudaExternalSemaphoreWaitNodeParamsV2",
-        "cudaExternalSemaphoreWaitNodeParams",
         "cudaExternalSemaphoreSignalSkipNvSciBufMemSync",
-        "cudaExternalSemaphoreSignalNodeParamsV2",
-        "cudaExternalSemaphoreSignalNodeParams",
         "cudaExternalSemaphoreHandleTypeTimelineSemaphoreWin32",
         "cudaExternalSemaphoreHandleTypeTimelineSemaphoreFd",
         "cudaExternalSemaphoreHandleTypeNvSciSync",
@@ -7571,7 +7598,6 @@ sub warnUnsupportedFunctions {
         "cudaDevAttrMaxAccessPolicyWindowSize",
         "cudaDevAttrMax",
         "cudaDevAttrIpcEventSupport",
-        "cudaDevAttrHostRegisterSupported",
         "cudaDevAttrHostRegisterReadOnlySupported",
         "cudaDevAttrHostNumaId",
         "cudaDevAttrGPUDirectRDMAWritesOrdering",
@@ -8382,7 +8408,6 @@ sub warnUnsupportedFunctions {
         "CU_DEVICE_ATTRIBUTE_MAXIMUM_SURFACE1D_LAYERED_LAYERS",
         "CU_DEVICE_ATTRIBUTE_MAX",
         "CU_DEVICE_ATTRIBUTE_IPC_EVENT_SUPPORTED",
-        "CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED",
         "CU_DEVICE_ATTRIBUTE_HOST_NUMA_ID",
         "CU_DEVICE_ATTRIBUTE_HANDLE_TYPE_WIN32_KMT_HANDLE_SUPPORTED",
         "CU_DEVICE_ATTRIBUTE_HANDLE_TYPE_WIN32_HANDLE_SUPPORTED",
@@ -9142,16 +9167,6 @@ sub warnUnsupportedFunctions {
         "CUDA_GRAPH_INSTANTIATE_MULTIPLE_CTXS_NOT_SUPPORTED",
         "CUDA_GRAPH_INSTANTIATE_INVALID_STRUCTURE",
         "CUDA_GRAPH_INSTANTIATE_ERROR",
-        "CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st",
-        "CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2",
-        "CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1",
-        "CUDA_EXT_SEM_WAIT_NODE_PARAMS_st",
-        "CUDA_EXT_SEM_WAIT_NODE_PARAMS",
-        "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2_st",
-        "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2",
-        "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1",
-        "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st",
-        "CUDA_EXT_SEM_SIGNAL_NODE_PARAMS",
         "CUDA_EXTERNAL_SEMAPHORE_WAIT_SKIP_NVSCIBUF_MEMSYNC",
         "CUDA_EXTERNAL_SEMAPHORE_SIGNAL_SKIP_NVSCIBUF_MEMSYNC",
         "CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_v1",
@@ -10379,7 +10394,7 @@ if ($help) {
     print STDERR "$USAGE\n";
 }
 if ($version) {
-    print STDERR "HIP version 5.7.0\n";
+    print STDERR "HIP version 6.0.0\n";
 }
 while (@ARGV) {
     $fileName=shift (@ARGV);

diff --git a/docs/tables/CUDA_Driver_API_functions_supported_by_HIP.md b/docs/tables/CUDA_Driver_API_functions_supported_by_HIP.md
@@ -155,16 +155,16 @@
 |`CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_st`|10.0| | |`hipExternalSemaphoreWaitParams_st`|4.4.0| | | |
 |`CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS_v1`|11.3| | |`hipExternalSemaphoreWaitParams`|4.4.0| | | |
 |`CUDA_EXTERNAL_SEMAPHORE_WAIT_SKIP_NVSCIBUF_MEMSYNC`|10.2| | | | | | | |
-|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS`|11.2| | | | | | | |
-|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st`|11.2| | | | | | | |
-|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1`|11.3| | | | | | | |
-|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2`|12.2| | | | | | | |
-|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2_st`|12.2| | | | | | | |
-|`CUDA_EXT_SEM_WAIT_NODE_PARAMS`|11.2| | | | | | | |
-|`CUDA_EXT_SEM_WAIT_NODE_PARAMS_st`|11.2| | | | | | | |
-|`CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1`|11.3| | | | | | | |
-|`CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2`|12.2| | | | | | | |
-|`CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st`|12.2| | | | | | | |
+|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS`|11.2| | |`hipExternalSemaphoreSignalNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st`|11.2| | |`hipExternalSemaphoreSignalNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1`|11.3| | |`hipExternalSemaphoreSignalNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2`|12.2| | |`hipExternalSemaphoreSignalNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2_st`|12.2| | |`hipExternalSemaphoreSignalNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_WAIT_NODE_PARAMS`|11.2| | |`hipExternalSemaphoreWaitNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_WAIT_NODE_PARAMS_st`|11.2| | |`hipExternalSemaphoreWaitNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1`|11.3| | |`hipExternalSemaphoreWaitNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2`|12.2| | |`hipExternalSemaphoreWaitNodeParams`|6.0.0| | |6.0.0|
+|`CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st`|12.2| | |`hipExternalSemaphoreWaitNodeParams`|6.0.0| | |6.0.0|
 |`CUDA_GRAPH_INSTANTIATE_ERROR`|12.0| | | | | | | |
 |`CUDA_GRAPH_INSTANTIATE_FLAG_AUTO_FREE_ON_LAUNCH`|11.4| | |`hipGraphInstantiateFlagAutoFreeOnLaunch`|5.2.0| | | |
 |`CUDA_GRAPH_INSTANTIATE_FLAG_DEVICE_LAUNCH`|12.0| | |`hipGraphInstantiateFlagDeviceLaunch`|5.6.0| | | |
@@ -375,7 +375,7 @@
 |`CU_DEVICE_ATTRIBUTE_HANDLE_TYPE_WIN32_KMT_HANDLE_SUPPORTED`|10.2| | | | | | | |
 |`CU_DEVICE_ATTRIBUTE_HOST_NATIVE_ATOMIC_SUPPORTED`|8.0| | |`hipDeviceAttributeHostNativeAtomicSupported`|4.3.0| | | |
 |`CU_DEVICE_ATTRIBUTE_HOST_NUMA_ID`|12.2| | | | | | | |
-|`CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED`|9.2| | | | | | | |
+|`CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED`|9.2| | |`hipDeviceAttributeHostRegisterSupported`|6.0.0| | |6.0.0|
 |`CU_DEVICE_ATTRIBUTE_INTEGRATED`| | | |`hipDeviceAttributeIntegrated`|1.9.0| | | |
 |`CU_DEVICE_ATTRIBUTE_IPC_EVENT_SUPPORTED`|12.0| | | | | | | |
 |`CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT`| | | |`hipDeviceAttributeKernelExecTimeout`|2.10.0| | | |

diff --git a/docs/tables/CUDA_Runtime_API_functions_supported_by_HIP.md b/docs/tables/CUDA_Runtime_API_functions_supported_by_HIP.md
@@ -665,7 +665,7 @@
 |`cudaDevAttrHostNativeAtomicSupported`|8.0| | |`hipDeviceAttributeHostNativeAtomicSupported`|4.3.0| | | |
 |`cudaDevAttrHostNumaId`|12.2| | | | | | | |
 |`cudaDevAttrHostRegisterReadOnlySupported`|11.1| | | | | | | |
-|`cudaDevAttrHostRegisterSupported`|9.2| | | | | | | |
+|`cudaDevAttrHostRegisterSupported`|9.2| | |`hipDeviceAttributeHostRegisterSupported`|6.0.0| | |6.0.0|
 |`cudaDevAttrIntegrated`| | | |`hipDeviceAttributeIntegrated`|1.9.0| | | |
 |`cudaDevAttrIpcEventSupport`|12.0| | | | | | | |
 |`cudaDevAttrIsMultiGpuBoard`| | | |`hipDeviceAttributeIsMultiGpuBoard`|1.6.0| | | |
@@ -1046,13 +1046,13 @@
 |`cudaExternalSemaphoreHandleTypeOpaqueWin32Kmt`|10.0| | |`hipExternalSemaphoreHandleTypeOpaqueWin32Kmt`|4.4.0| | | |
 |`cudaExternalSemaphoreHandleTypeTimelineSemaphoreFd`|11.2| | | | | | | |
 |`cudaExternalSemaphoreHandleTypeTimelineSemaphoreWin32`|11.2| | | | | | | |
-|`cudaExternalSemaphoreSignalNodeParams`|11.2| | | | | | | |
-|`cudaExternalSemaphoreSignalNodeParamsV2`|12.2| | | | | | | |
+|`cudaExternalSemaphoreSignalNodeParams`|11.2| | |`hipExternalSemaphoreSignalNodeParams`|6.0.0| | |6.0.0|
+|`cudaExternalSemaphoreSignalNodeParamsV2`|12.2| | |`hipExternalSemaphoreSignalNodeParams`|6.0.0| | |6.0.0|
 |`cudaExternalSemaphoreSignalParams`|10.0| | |`hipExternalSemaphoreSignalParams`|4.4.0| | | |
 |`cudaExternalSemaphoreSignalParams_v1`|11.2| | |`hipExternalSemaphoreSignalParams`|4.4.0| | | |
 |`cudaExternalSemaphoreSignalSkipNvSciBufMemSync`|10.2| | | | | | | |
-|`cudaExternalSemaphoreWaitNodeParams`|11.2| | | | | | | |
-|`cudaExternalSemaphoreWaitNodeParamsV2`|12.2| | | | | | | |
+|`cudaExternalSemaphoreWaitNodeParams`|11.2| | |`hipExternalSemaphoreWaitNodeParams`|6.0.0| | |6.0.0|
+|`cudaExternalSemaphoreWaitNodeParamsV2`|12.2| | |`hipExternalSemaphoreWaitNodeParams`|6.0.0| | |6.0.0|
 |`cudaExternalSemaphoreWaitParams`|10.0| | |`hipExternalSemaphoreWaitParams`|4.4.0| | | |
 |`cudaExternalSemaphoreWaitParams_v1`|11.2| | |`hipExternalSemaphoreWaitParams`|4.4.0| | | |
 |`cudaExternalSemaphoreWaitSkipNvSciBufMemSync`|10.2| | | | | | | |

diff --git a/src/CUDA2HIP_Driver_API_types.cpp b/src/CUDA2HIP_Driver_API_types.cpp
@@ -278,20 +278,20 @@ const std::map<llvm::StringRef, hipCounter> CUDA_DRIVER_TYPE_NAME_MAP {
   {"CUmemoryPool",                                                     {"hipMemPool_t",                                             "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES}},
 
   // cudaExternalSemaphoreSignalNodeParams
-  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st",                               {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
-  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS",                                  {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
-  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1",                               {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
+  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st",                               {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
+  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS",                                  {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
+  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v1",                               {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
   // cudaExternalSemaphoreSignalNodeParamsV2
-  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2_st",                            {"hipExternalSemaphoreSignalNodeParams_v2",                  "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
-  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2",                               {"hipExternalSemaphoreSignalNodeParams_v2",                  "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
+  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2_st",                            {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
+  {"CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2",                               {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
 
   // cudaExternalSemaphoreWaitNodeParams
-  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS_st",                                 {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
-  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS",                                    {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
-  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1",                                 {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
+  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS_st",                                 {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
+  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS",                                    {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
+  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS_v1",                                 {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
   // cudaExternalSemaphoreWaitNodeParamsV2
-  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st",                              {"hipExternalSemaphoreWaitNodeParams_v2",                    "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
-  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2",                                 {"hipExternalSemaphoreWaitNodeParams_v2",                    "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
+  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st",                              {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
+  {"CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2",                                 {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
 
   // cudaMemPoolProps
   {"CUmemPoolProps_st",                                                {"hipMemPoolProps",                                          "", CONV_TYPE, API_DRIVER, SEC::DATA_TYPES}},
@@ -814,7 +814,7 @@ const std::map<llvm::StringRef, hipCounter> CUDA_DRIVER_TYPE_NAME_MAP {
   // cudaDevAttrCanFlushRemoteWrites
   {"CU_DEVICE_ATTRIBUTE_CAN_FLUSH_REMOTE_WRITES",                      {"hipDeviceAttributeCanFlushRemoteWrites",                   "", CONV_NUMERIC_LITERAL, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}}, // 98
   // cudaDevAttrHostRegisterSupported
-  {"CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED",                      {"hipDeviceAttributeHostRegisterSupported",                  "", CONV_NUMERIC_LITERAL, API_DRIVER, SEC::DATA_TYPES, HIP_UNSUPPORTED}}, // 99
+  {"CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED",                      {"hipDeviceAttributeHostRegisterSupported",                  "", CONV_NUMERIC_LITERAL, API_DRIVER, SEC::DATA_TYPES, HIP_EXPERIMENTAL}}, // 99
   // cudaDevAttrPageableMemoryAccessUsesHostPageTables
   {"CU_DEVICE_ATTRIBUTE_PAGEABLE_MEMORY_ACCESS_USES_HOST_PAGE_TABLES", {"hipDeviceAttributePageableMemoryAccessUsesHostPageTables", "", CONV_NUMERIC_LITERAL, API_DRIVER, SEC::DATA_TYPES}}, // 100
   // cudaDevAttrDirectManagedMemAccessFromHost
@@ -3967,4 +3967,7 @@ const std::map<llvm::StringRef, hipAPIversions> HIP_DRIVER_TYPE_NAME_VER_MAP {
   {"hiprtcLinkState",                                                  {HIP_5030, HIP_0,    HIP_0   }},
   {"hipFunctionLaunchParams_t",                                        {HIP_5050, HIP_0,    HIP_0   }},
   {"hipFunctionLaunchParams",                                          {HIP_5050, HIP_0,    HIP_0   }},
+  {"hipDeviceAttributeHostRegisterSupported",                          {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipExternalSemaphoreSignalNodeParams",                             {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
+  {"hipExternalSemaphoreWaitNodeParams",                               {HIP_6000, HIP_0,    HIP_0,  HIP_LATEST}},
 };
diff --git a/src/CUDA2HIP_Runtime_API_types.cpp b/src/CUDA2HIP_Runtime_API_types.cpp
@@ -215,14 +215,14 @@ const std::map<llvm::StringRef, hipCounter> CUDA_RUNTIME_TYPE_NAME_MAP {
   {"cudaMemPoolPtrExportData",                                         {"hipMemPoolPtrExportData",                                  "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES}},
 
   // CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_st
-  {"cudaExternalSemaphoreSignalNodeParams",                            {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
+  {"cudaExternalSemaphoreSignalNodeParams",                            {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
   // CUDA_EXT_SEM_SIGNAL_NODE_PARAMS_v2_st
-  {"cudaExternalSemaphoreSignalNodeParamsV2",                          {"hipExternalSemaphoreSignalNodeParams_v2",                  "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
+  {"cudaExternalSemaphoreSignalNodeParamsV2",                          {"hipExternalSemaphoreSignalNodeParams",                     "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
 
   // CUDA_EXT_SEM_WAIT_NODE_PARAMS_st
-  {"cudaExternalSemaphoreWaitNodeParams",                              {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
+  {"cudaExternalSemaphoreWaitNodeParams",                              {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
   // CUDA_EXT_SEM_WAIT_NODE_PARAMS_v2_st
-  {"cudaExternalSemaphoreWaitNodeParamsV2",                            {"hipExternalSemaphoreWaitNodeParams_v2",                    "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES, HIP_UNSUPPORTED}},
+  {"cudaExternalSemaphoreWaitNodeParamsV2",                            {"hipExternalSemaphoreWaitNodeParams",                       "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES, HIP_EXPERIMENTAL}},
 
   // CUDA_MEM_ALLOC_NODE_PARAMS_st
   {"cudaMemAllocNodeParams",                                           {"hipMemAllocNodeParams",                                    "", CONV_TYPE, API_RUNTIME, SEC::DATA_TYPES}},
@@ -580,7 +580,7 @@ const std::map<llvm::StringRef, hipCounter> CUDA_RUNTIME_TYPE_NAME_MAP {
   // CU_DEVICE_ATTRIBUTE_CAN_FLUSH_REMOTE_WRITES
   {"cudaDevAttrCanFlushRemoteWrites",                                  {"hipDeviceAttributeCanFlushRemoteWrites",                   "", CONV_NUMERIC_LITERAL, API_RUNTIME, SEC::DATA_TYPES, HIP_UNSUPPORTED}}, // 98
   // CU_DEVICE_ATTRIBUTE_HOST_REGISTER_SUPPORTED
-  {"cudaDevAttrHostRegisterSupported",                                 {"hipDeviceAttributeHostRegisterSupported",                  "", CONV_NUMERIC_LITERAL, API_RUNTIME, SEC::DATA_TYPES, HIP_UNSUPPORTED}}, // 99
+  {"cudaDevAttrHostRegisterSupported",                                 {"hipDeviceAttributeHostRegisterSupported",                  "", CONV_NUMERIC_LITERAL, API_RUNTIME, SEC::DATA_TYPES, HIP_EXPERIMENTAL}}, // 99
   // CU_DEVICE_ATTRIBUTE_PAGEABLE_MEMORY_ACCESS_USES_HOST_PAGE_TABLES
   {"cudaDevAttrPageableMemoryAccessUsesHostPageTables",                {"hipDeviceAttributePageableMemoryAccessUsesHostPageTables", "", CONV_NUMERIC_LITERAL, API_RUNTIME, SEC::DATA_TYPES}}, // 100
   // CU_DEVICE_ATTRIBUTE_DIRECT_MANAGED_MEM_ACCESS_FROM_HOST

diff --git a/src/Statistics.cpp b/src/Statistics.cpp
@@ -598,6 +598,7 @@ std::string Statistics::getHipVersion(const hipVersions& ver) {
     case HIP_5050: return "5.5.0";
     case HIP_5060: return "5.6.0";
     case HIP_5070: return "5.7.0";
+    case HIP_6000: return "6.0.0";
   }
   return "";
 }