diff --git a/sycl/tools/CMakeLists.txt b/sycl/tools/CMakeLists.txt
index 85b9069eb5fd3..fdadd373f6cd3 100644
--- a/sycl/tools/CMakeLists.txt
+++ b/sycl/tools/CMakeLists.txt
@@ -31,4 +31,13 @@ target_compile_definitions(get_device_count_by_type
   PRIVATE
     $<$<BOOL:${SYCL_BUILD_PI_CUDA}>:USE_PI_CUDA>
     $<$<BOOL:${SYCL_BUILD_PI_ROCM}>:USE_PI_ROCM>
+    # For ROCm set the HIP define depending on the platform
+    $<$<AND:$<BOOL:${SYCL_BUILD_PI_ROCM}>,$<STREQUAL:${SYCL_BUILD_PI_ROCM_PLATFORM},AMD>>:__HIP_PLATFORM_AMD__>
+    $<$<AND:$<BOOL:${SYCL_BUILD_PI_ROCM}>,$<STREQUAL:${SYCL_BUILD_PI_ROCM_PLATFORM},NVIDIA>>:__HIP_PLATFORM_NVIDIA__>
 )
+
+if(SYCL_BUILD_PI_ROCM)
+  target_include_directories(get_device_count_by_type
+    PRIVATE
+    ${SYCL_BUILD_PI_ROCM_INCLUDE_DIR})
+endif()
diff --git a/sycl/tools/get_device_count_by_type.cpp b/sycl/tools/get_device_count_by_type.cpp
index 5c9d57bc74a4a..b8d1dbe030869 100644
--- a/sycl/tools/get_device_count_by_type.cpp
+++ b/sycl/tools/get_device_count_by_type.cpp
@@ -20,6 +20,10 @@
 #include <cuda.h>
 #endif // USE_PI_CUDA
 
+#ifdef USE_PI_ROCM
+#include <hip/hip_runtime.h>
+#endif // USE_PI_ROCM
+
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
@@ -32,7 +36,7 @@ static const std::string help =
     "   Help\n"
     "   Example: ./get_device_count_by_type cpu opencl\n"
     "   Supported device types: cpu/gpu/accelerator/default/all\n"
-    "   Supported backends: PI_CUDA/PI_OPENCL/PI_LEVEL_ZERO \n"
+    "   Supported backends: PI_CUDA/PI_ROCM/PI_OPENCL/PI_LEVEL_ZERO \n"
     "   Output format: <number_of_devices>:<additional_Information>";
 
 // Return the string with all characters translated to lower case.
@@ -224,6 +228,49 @@ static bool queryCUDA(cl_device_type deviceType, cl_uint &deviceCount,
 #endif
 }
 
+static bool queryROCm(cl_device_type deviceType, cl_uint &deviceCount,
+                      std::string &msg) {
+  deviceCount = 0u;
+#ifdef USE_PI_ROCM
+  switch (deviceType) {
+  case CL_DEVICE_TYPE_DEFAULT: // Fall through.
+  case CL_DEVICE_TYPE_ALL:     // Fall through.
+  case CL_DEVICE_TYPE_GPU: {
+    int count = 0;
+    hipError_t err = hipGetDeviceCount(&count);
+    if (err != hipSuccess || count < 0) {
+      msg = "ERROR: ROCm error querying device count";
+      return false;
+    }
+    if (count < 1) {
+      msg = "ERROR: ROCm no device found";
+      return false;
+    }
+    deviceCount = static_cast<cl_uint>(count);
+#if defined(__HIP_PLATFORM_AMD__)
+    msg = "rocm-amd ";
+#elif defined(__HIP_PLATFORM_NVIDIA__)
+    msg = "rocm-nvidia ";
+#else
+#error("Must define one of __HIP_PLATFORM_AMD__ or __HIP_PLATFORM_NVIDIA__");
+#endif
+    msg += deviceTypeToString(deviceType);
+    return true;
+  } break;
+  default:
+    msg = "WARNING: ROCm unsupported device type ";
+    msg += deviceTypeToString(deviceType);
+    return true;
+  }
+#else
+  (void)deviceType;
+  msg = "ERROR: ROCm not supported";
+  deviceCount = 0u;
+
+  return false;
+#endif
+}
+
 int main(int argc, char *argv[]) {
   if (argc < 3) {
     std::cout << "0:ERROR: Please set a device type and backend to find"
@@ -264,6 +311,8 @@ int main(int argc, char *argv[]) {
     querySuccess = queryLevelZero(deviceType, deviceCount, msg);
   } else if (backend == "cuda" || backend == "pi_cuda") {
     querySuccess = queryCUDA(deviceType, deviceCount, msg);
+  } else if (backend == "rocm" || backend == "pi_rocm") {
+    querySuccess = queryROCm(deviceType, deviceCount, msg);
   } else {
     msg = "ERROR: Unknown backend " + backend + "\n" + help + "\n";
   }