From 8dafc868c07ecacf6a6e1ff9df7a341cf31b56e9 Mon Sep 17 00:00:00 2001
From: NguyenNhuDi <dinguyennhu@gmail.com>
Date: Mon, 14 Jul 2025 14:43:53 -0600
Subject: [PATCH 1/3] implemented fix

---
 projects/rocthrust/CHANGELOG.md                        | 2 ++
 projects/rocthrust/benchmarks/bench/transform/basic.cu | 2 +-
 projects/rocthrust/cmake/Dependencies.cmake            | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/projects/rocthrust/CHANGELOG.md b/projects/rocthrust/CHANGELOG.md
index b468ec1cc48..d33c5a370ec 100644
--- a/projects/rocthrust/CHANGELOG.md
+++ b/projects/rocthrust/CHANGELOG.md
@@ -10,6 +10,7 @@ Documentation for rocThrust available at
 * Updated the required version of Google Benchmark from 1.8.0 to 1.9.0.
 * Drop `c++14` support for rocthrust.
 * Renamed `cpp14_required.h` to `cpp_version_check.h`
+* Switched to using `clang++` to compile for google benchmark on Windows system
 
 ### Removed
 
@@ -33,6 +34,7 @@ Documentation for rocThrust available at
 
 ### Known Issues
 * The order of the values being compared by thrust::exclusive_scan_by_key and thrust::inclusive_scan_by_key can change between runs when integers are being compared. This can cause incorrect output when a non-commutative operator such as division is being used.
+
 ## rocThrust 3.3.0 for ROCm 6.4
 
 ### Added
diff --git a/projects/rocthrust/benchmarks/bench/transform/basic.cu b/projects/rocthrust/benchmarks/bench/transform/basic.cu
index 772debba91c..22f00a4e2b5 100644
--- a/projects/rocthrust/benchmarks/bench/transform/basic.cu
+++ b/projects/rocthrust/benchmarks/bench/transform/basic.cu
@@ -257,7 +257,7 @@ void add_benchmarks(const std::string& name, std::vector<benchmark::internal::Be
     BENCHMARK_BABELSTREAM_TYPE(int16_t),
     BENCHMARK_BABELSTREAM_TYPE(float),
     BENCHMARK_BABELSTREAM_TYPE(double),
-    BENCHMARK_BABELSTREAM_TYPE(int128_t),
+    BENCHMARK_BABELSTREAM_TYPE(rocprim::int128_t),
   };
 
   benchmarks.insert(benchmarks.end(), bs.begin(), bs.end());
diff --git a/projects/rocthrust/cmake/Dependencies.cmake b/projects/rocthrust/cmake/Dependencies.cmake
index 9fd1a3102a1..6fd94ff6e4b 100644
--- a/projects/rocthrust/cmake/Dependencies.cmake
+++ b/projects/rocthrust/cmake/Dependencies.cmake
@@ -152,7 +152,8 @@ if(BUILD_BENCHMARKS)
     if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
     # hip-clang cannot compile googlebenchmark for some reason
       if(WIN32)
-        set(COMPILER_OVERRIDE "-DCMAKE_CXX_COMPILER=cl")
+        get_filename_component(CXX_DIRNAME ${CMAKE_CXX_COMPILER} DIRECTORY)
+        set(COMPILER_OVERRIDE "-DCMAKE_CXX_COMPILER=${CXX_DIRNAME}/clang++.exe")
       else()
         set(COMPILER_OVERRIDE "-DCMAKE_CXX_COMPILER=g++")
       endif()

From 7b990950f9c691dcc6e88f3c2fdf5c398eca1c7b Mon Sep 17 00:00:00 2001
From: NguyenNhuDi <dinguyennhu@gmail.com>
Date: Tue, 15 Jul 2025 09:11:26 -0600
Subject: [PATCH 2/3] removed comment aboout hiop-clang can not compile google
 benchmark

---
 projects/rocthrust/cmake/Dependencies.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/projects/rocthrust/cmake/Dependencies.cmake b/projects/rocthrust/cmake/Dependencies.cmake
index 6fd94ff6e4b..467aa6728a1 100644
--- a/projects/rocthrust/cmake/Dependencies.cmake
+++ b/projects/rocthrust/cmake/Dependencies.cmake
@@ -150,7 +150,6 @@ if(BUILD_BENCHMARKS)
     endif()
     set(GOOGLEBENCHMARK_ROOT ${CMAKE_CURRENT_BINARY_DIR}/deps/googlebenchmark CACHE PATH "")
     if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
-    # hip-clang cannot compile googlebenchmark for some reason
       if(WIN32)
         get_filename_component(CXX_DIRNAME ${CMAKE_CXX_COMPILER} DIRECTORY)
         set(COMPILER_OVERRIDE "-DCMAKE_CXX_COMPILER=${CXX_DIRNAME}/clang++.exe")

From b629146316b94b3e3125f1ede412704ff2212e8a Mon Sep 17 00:00:00 2001
From: Di Nguyen <dinguyennhu@gmail.com>
Date: Wed, 16 Jul 2025 09:22:15 -0600
Subject: [PATCH 3/3] Update projects/rocthrust/CHANGELOG.md

Co-authored-by: spolifroni-amd <Sandra.Polifroni@amd.com>
---
 projects/rocthrust/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/rocthrust/CHANGELOG.md b/projects/rocthrust/CHANGELOG.md
index 7d5e0dd8efe..6115381cde5 100644
--- a/projects/rocthrust/CHANGELOG.md
+++ b/projects/rocthrust/CHANGELOG.md
@@ -10,7 +10,7 @@ Documentation for rocThrust available at
 * Updated the required version of Google Benchmark from 1.8.0 to 1.9.0.
 * Drop `c++14` support for rocthrust.
 * Renamed `cpp14_required.h` to `cpp_version_check.h`
-* Switched to using `clang++` to compile for google benchmark on Windows system
+* `clang++` is now used to compile google benchmarks on Windows.```
 * Added gfx950 support.
 * Merged changes from upstream CCCL/thrust 2.6.0