Merge pull request #1796 from LLNL/task/rhornung67/squash-more-warnings

rhornung67 · web-flow · commit 26c10bdddb20 · 2025-02-27T08:18:15.000-08:00
Squash compiler warnings that appear in various CI checks
diff --git a/include/RAJA/policy/sycl/forall.hpp b/include/RAJA/policy/sycl/forall.hpp
@@ -102,8 +102,7 @@ forall_impl(resources::Sycl& sycl_res,
             ForallParam)
 {
 
-  using Iterator  = camp::decay<decltype(std::begin(iter))>;
-  using LOOP_BODY = camp::decay<LoopBody>;
+  using Iterator = camp::decay<decltype(std::begin(iter))>;
   using IndexType =
       camp::decay<decltype(std::distance(std::begin(iter), std::end(iter)))>;
 
@@ -247,8 +246,7 @@ forall_impl(resources::Sycl& sycl_res,
             ForallParam f_params)
 
 {
-  using Iterator  = camp::decay<decltype(std::begin(iter))>;
-  using LOOP_BODY = camp::decay<LoopBody>;
+  using Iterator = camp::decay<decltype(std::begin(iter))>;
   using IndexType =
       camp::decay<decltype(std::distance(std::begin(iter), std::end(iter)))>;
   using EXEC_POL = camp::decay<decltype(pol)>;
@@ -271,6 +269,7 @@ forall_impl(resources::Sycl& sycl_res,
     //
     sycl_dim_t blockSize {BlockSize};
     sycl_dim_t gridSize = impl::getGridDim(static_cast<size_t>(len), BlockSize);
+    RAJA_UNUSED_VAR(gridSize);
 
     ::sycl::queue* q = sycl_res.get_queue();
 
@@ -348,6 +347,7 @@ forall_impl(resources::Sycl& sycl_res,
     //
     sycl_dim_t blockSize {BlockSize};
     sycl_dim_t gridSize = impl::getGridDim(static_cast<size_t>(len), BlockSize);
+    RAJA_UNUSED_VAR(gridSize);
 
     ::sycl::queue* q = sycl_res.get_queue();
 
diff --git a/include/RAJA/policy/sycl/kernel/Lambda.hpp b/include/RAJA/policy/sycl/kernel/Lambda.hpp
@@ -51,7 +51,7 @@ struct SyclStatementExecutor<Data,
 {
 
   static inline RAJA_DEVICE void exec(Data& data,
-                                      ::sycl::nd_item<3> item,
+                                      ::sycl::nd_item<3> RAJA_UNUSED_ARG(item),
                                       bool thread_active)
   {
     // Only execute the lambda if it hasn't been masked off
diff --git a/include/RAJA/policy/sycl/kernel/SyclKernel.hpp b/include/RAJA/policy/sycl/kernel/SyclKernel.hpp
@@ -128,7 +128,7 @@ struct SyclLaunchHelper<false, sycl_launch<async0>, StmtList, Data, Types>
 
   static void launch(Data&& data,
                      internal::LaunchDims launch_dims,
-                     size_t shmem,
+                     size_t RAJA_UNUSED_ARG(shmem),
                      ::sycl::queue* qu)
   {
 
@@ -169,7 +169,7 @@ struct SyclLaunchHelper<true, sycl_launch<async0>, StmtList, Data, Types>
 
   static void launch(Data&& data,
                      internal::LaunchDims launch_dims,
-                     size_t shmem,
+                     size_t RAJA_UNUSED_ARG(shmem),
                      ::sycl::queue* qu)
   {
 
diff --git a/include/RAJA/policy/sycl/kernel/internal.hpp b/include/RAJA/policy/sycl/kernel/internal.hpp
@@ -124,7 +124,7 @@ struct LaunchDims
     // Prefer larger z -> y -> x
     if (launch_local.x * launch_local.y * launch_local.z > max_work_group_size)
     {
-      int remaining = 1;
+      unsigned long remaining = 1;
       // local z cannot be > max_wrk from above
       // if equal then remaining is 1, on handle <
       if (max_work_group_size > launch_local.z)
@@ -236,7 +236,9 @@ struct SyclStatementListExecutorHelper<num_stmts, num_stmts, StmtList>
 {
 
   template<typename Data>
-  inline static RAJA_DEVICE void exec(Data&, ::sycl::nd_item<3> item, bool)
+  inline static RAJA_DEVICE void exec(Data&,
+                                      ::sycl::nd_item<3> RAJA_UNUSED_ARG(item),
+                                      bool)
   {
     // nop terminator
   }
diff --git a/include/RAJA/policy/sycl/launch.hpp b/include/RAJA/policy/sycl/launch.hpp
@@ -65,7 +65,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
         params.threads.value[0] * params.teams.value[0]);
 
     // Only launch kernel if we have something to iterate over
-    constexpr size_t zero = 0;
+    constexpr int zero = 0;
     if (params.threads.value[0] > zero && params.threads.value[1] > zero &&
         params.threads.value[2] > zero && params.teams.value[0] > zero &&
         params.teams.value[1] > zero && params.teams.value[2] > zero)
@@ -139,7 +139,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
         launch_params.threads.value[0] * launch_params.teams.value[0]);
 
     // Only launch kernel if we have something to iterate over
-    constexpr size_t zero = 0;
+    constexpr int zero = 0;
     if (launch_params.threads.value[0] > zero &&
         launch_params.threads.value[1] > zero &&
         launch_params.threads.value[2] > zero &&
@@ -206,7 +206,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
       RAJA::expt::type_traits::is_ForallParamPack_empty<ReduceParams>>
   exec(RAJA::resources::Resource res,
        const LaunchParams& params,
-       const char* kernel_name,
+       const char* RAJA_UNUSED_ARG(kernel_name),
        BODY_IN&& body_in,
        ReduceParams& RAJA_UNUSED_ARG(launch_reducers))
   {
@@ -228,7 +228,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
         params.threads.value[0] * params.teams.value[0]);
 
     // Only launch kernel if we have something to iterate over
-    constexpr size_t zero = 0;
+    constexpr int zero = 0;
     if (params.threads.value[0] > zero && params.threads.value[1] > zero &&
         params.threads.value[2] > zero && params.teams.value[0] > zero &&
         params.teams.value[1] > zero && params.teams.value[2] > zero)
@@ -283,7 +283,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
           RAJA::expt::type_traits::is_ForallParamPack_empty<ReduceParams>>>
   exec(RAJA::resources::Resource res,
        const LaunchParams& launch_params,
-       const char* kernel_name,
+       const char* RAJA_UNUSED_ARG(kernel_name),
        BODY_IN&& body_in,
        ReduceParams launch_reducers)
   {
@@ -308,7 +308,7 @@ struct LaunchExecute<RAJA::sycl_launch_t<async, 0>>
         launch_params.threads.value[0] * launch_params.teams.value[0]);
 
     // Only launch kernel if we have something to iterate over
-    constexpr size_t zero = 0;
+    constexpr int zero = 0;
     if (launch_params.threads.value[0] > zero &&
         launch_params.threads.value[1] > zero &&
         launch_params.threads.value[2] > zero &&
diff --git a/include/RAJA/policy/sycl/reduce.hpp b/include/RAJA/policy/sycl/reduce.hpp
@@ -140,7 +140,7 @@ struct Reduce_Data
   Reduce_Data(const Reduce_Data&) = default;
 
   //! transfers from the host to the device -- exit() is called upon failure
-  RAJA_INLINE void hostToDevice(Offload_Info& info)
+  RAJA_INLINE void hostToDevice(Offload_Info& RAJA_UNUSED_ARG(info))
   {
     ::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();
 
@@ -159,7 +159,7 @@ struct Reduce_Data
   }
 
   //! transfers from the device to the host -- exit() is called upon failure
-  RAJA_INLINE void deviceToHost(Offload_Info& info)
+  RAJA_INLINE void deviceToHost(Offload_Info& RAJA_UNUSED_ARG(info))
   {
     ::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();
 
@@ -178,7 +178,7 @@ struct Reduce_Data
   }
 
   //! frees all data from the offload information passed
-  RAJA_INLINE void cleanup(Offload_Info& info)
+  RAJA_INLINE void cleanup(Offload_Info& RAJA_UNUSED_ARG(info))
   {
     ::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();
 
@@ -207,8 +207,8 @@ struct TargetReduce
   TargetReduce(const TargetReduce&) = default;
 
   explicit TargetReduce(T init_val)
-      : info(),
-        val(Reducer::identity(), Reducer::identity(), info),
+      : val(Reducer::identity(), Reducer::identity(), info),
+        info(),
         initVal(init_val),
         finalVal(Reducer::identity())
   {}
diff --git a/tpl/camp b/tpl/camp
@@ -1 +1 @@
-Subproject commit 7866dc34a4f86b6c58891f6daf9f6da0f89b3d94
+Subproject commit 8fc8e3238fd58bf4c47aff23b852f0d383c05f7e

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ struct SyclStatementExecutor<Data,`
`51`	`51`	`{`
`52`	`52`
`53`	`53`	`static inline RAJA_DEVICE void exec(Data& data,`
`54`		`- ::sycl::nd_item<3> item,`
	`54`	`+ ::sycl::nd_item<3> RAJA_UNUSED_ARG(item),`
`55`	`55`	`bool thread_active)`
`56`	`56`	`{`
`57`	`57`	`// Only execute the lambda if it hasn't been masked off`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ struct SyclLaunchHelper<false, sycl_launch<async0>, StmtList, Data, Types>`
`128`	`128`
`129`	`129`	`static void launch(Data&& data,`
`130`	`130`	`internal::LaunchDims launch_dims,`
`131`		`- size_t shmem,`
	`131`	`+ size_t RAJA_UNUSED_ARG(shmem),`
`132`	`132`	`::sycl::queue* qu)`
`133`	`133`	`{`
`134`	`134`
`@@ -169,7 +169,7 @@ struct SyclLaunchHelper<true, sycl_launch<async0>, StmtList, Data, Types>`
`169`	`169`
`170`	`170`	`static void launch(Data&& data,`
`171`	`171`	`internal::LaunchDims launch_dims,`
`172`		`- size_t shmem,`
	`172`	`+ size_t RAJA_UNUSED_ARG(shmem),`
`173`	`173`	`::sycl::queue* qu)`
`174`	`174`	`{`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ struct LaunchDims`
`124`	`124`	`// Prefer larger z -> y -> x`
`125`	`125`	`if (launch_local.x * launch_local.y * launch_local.z > max_work_group_size)`
`126`	`126`	`{`
`127`		`- int remaining = 1;`
	`127`	`+ unsigned long remaining = 1;`
`128`	`128`	`// local z cannot be > max_wrk from above`
`129`	`129`	`// if equal then remaining is 1, on handle <`
`130`	`130`	`if (max_work_group_size > launch_local.z)`
`@@ -236,7 +236,9 @@ struct SyclStatementListExecutorHelper<num_stmts, num_stmts, StmtList>`
`236`	`236`	`{`
`237`	`237`
`238`	`238`	`template<typename Data>`
`239`		`- inline static RAJA_DEVICE void exec(Data&, ::sycl::nd_item<3> item, bool)`
	`239`	`+ inline static RAJA_DEVICE void exec(Data&,`
	`240`	`+ ::sycl::nd_item<3> RAJA_UNUSED_ARG(item),`
	`241`	`+ bool)`
`240`	`242`	`{`
`241`	`243`	`// nop terminator`
`242`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ struct Reduce_Data`
`140`	`140`	`Reduce_Data(const Reduce_Data&) = default;`
`141`	`141`
`142`	`142`	`//! transfers from the host to the device -- exit() is called upon failure`
`143`		`- RAJA_INLINE void hostToDevice(Offload_Info& info)`
	`143`	`+ RAJA_INLINE void hostToDevice(Offload_Info& RAJA_UNUSED_ARG(info))`
`144`	`144`	`{`
`145`	`145`	`::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();`
`146`	`146`
`@@ -159,7 +159,7 @@ struct Reduce_Data`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`//! transfers from the device to the host -- exit() is called upon failure`
`162`		`- RAJA_INLINE void deviceToHost(Offload_Info& info)`
	`162`	`+ RAJA_INLINE void deviceToHost(Offload_Info& RAJA_UNUSED_ARG(info))`
`163`	`163`	`{`
`164`	`164`	`::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();`
`165`	`165`
`@@ -178,7 +178,7 @@ struct Reduce_Data`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`//! frees all data from the offload information passed`
`181`		`- RAJA_INLINE void cleanup(Offload_Info& info)`
	`181`	`+ RAJA_INLINE void cleanup(Offload_Info& RAJA_UNUSED_ARG(info))`
`182`	`182`	`{`
`183`	`183`	`::sycl::queue* q = ::camp::resources::Sycl::get_default().get_queue();`
`184`	`184`
`@@ -207,8 +207,8 @@ struct TargetReduce`
`207`	`207`	`TargetReduce(const TargetReduce&) = default;`
`208`	`208`
`209`	`209`	`explicit TargetReduce(T init_val)`
`210`		`- : info(),`
`211`		`- val(Reducer::identity(), Reducer::identity(), info),`
	`210`	`+ : val(Reducer::identity(), Reducer::identity(), info),`
	`211`	`+ info(),`
`212`	`212`	`initVal(init_val),`
`213`	`213`	`finalVal(Reducer::identity())`
`214`	`214`	`{}`