Rename ImplForceGlobal to ImplForceGlobalLaunch

sandialabs · Jan 23, 2023 · 5b3b6e7 · 5b3b6e7
1 parent 478f087
commit 5b3b6e7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/core/src/HIP/Kokkos_HIP_KernelLaunch.hpp b/core/src/HIP/Kokkos_HIP_KernelLaunch.hpp
@@ -127,8 +127,9 @@ struct DeduceHIPLaunchMechanism {
       light_weight = Kokkos::Experimental::WorkItemProperty::HintLightWeight;
   static constexpr Kokkos::Experimental::WorkItemProperty::HintHeavyWeight_t
       heavy_weight = Kokkos::Experimental::WorkItemProperty::HintHeavyWeight;
-  static constexpr Kokkos::Experimental::WorkItemProperty::ImplForceGlobal_t
-      force_global = Kokkos::Experimental::WorkItemProperty::ImplForceGlobal;
+  static constexpr Kokkos::Experimental::WorkItemProperty::
+      ImplForceGlobalLaunch_t force_global_launch =
+          Kokkos::Experimental::WorkItemProperty::ImplForceGlobalLaunch;
   static constexpr typename DriverType::Policy::work_item_property property =
       typename DriverType::Policy::work_item_property();
 
@@ -162,7 +163,7 @@ struct DeduceHIPLaunchMechanism {
   // Kal<F<CMU     CG  LCG C  C        CG  LG C  G    CG  CG C  C
   // CMU<F          G  LCG G  G         G  LG G  G     G  CG G  G
   static constexpr HIPLaunchMechanism launch_mechanism =
-      ((property & force_global) == force_global)
+      ((property & force_global_launch) == force_global_launch)
           ? HIPLaunchMechanism::GlobalMemory
           : ((property & light_weight) == light_weight)
                 ? (sizeof(DriverType) < HIPTraits::KernelArgumentLimit

diff --git a/core/src/Kokkos_Concepts.hpp b/core/src/Kokkos_Concepts.hpp
@@ -74,14 +74,14 @@ struct WorkItemProperty {
       ImplWorkItemProperty<4>();
   constexpr static const ImplWorkItemProperty<8> HintIrregular =
       ImplWorkItemProperty<8>();
-  constexpr static const ImplWorkItemProperty<16> ImplForceGlobal =
+  constexpr static const ImplWorkItemProperty<16> ImplForceGlobalLaunch =
       ImplWorkItemProperty<16>();
-  using None_t            = ImplWorkItemProperty<0>;
-  using HintLightWeight_t = ImplWorkItemProperty<1>;
-  using HintHeavyWeight_t = ImplWorkItemProperty<2>;
-  using HintRegular_t     = ImplWorkItemProperty<4>;
-  using HintIrregular_t   = ImplWorkItemProperty<8>;
-  using ImplForceGlobal_t = ImplWorkItemProperty<16>;
+  using None_t                  = ImplWorkItemProperty<0>;
+  using HintLightWeight_t       = ImplWorkItemProperty<1>;
+  using HintHeavyWeight_t       = ImplWorkItemProperty<2>;
+  using HintRegular_t           = ImplWorkItemProperty<4>;
+  using HintIrregular_t         = ImplWorkItemProperty<8>;
+  using ImplForceGlobalLaunch_t = ImplWorkItemProperty<16>;
 };
 
 template <unsigned long pv1, unsigned long pv2>

diff --git a/core/unit_test/TestMathematicalSpecialFunctions.hpp b/core/unit_test/TestMathematicalSpecialFunctions.hpp
@@ -506,7 +506,8 @@ struct TestComplexBesselJ0Y0Function {
 
     // Call Bessel functions
 #if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 4)
-    using Property = Kokkos::Experimental::WorkItemProperty::ImplForceGlobal_t;
+    using Property =
+        Kokkos::Experimental::WorkItemProperty::ImplForceGlobalLaunchLaunch_t;
 #else
     using Property = Kokkos::Experimental::WorkItemProperty::None_t;
 #endif
@@ -801,7 +802,8 @@ struct TestComplexBesselJ1Y1Function {
 
     // Call Bessel functions
 #if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 4)
-    using Property = Kokkos::Experimental::WorkItemProperty::ImplForceGlobal_t;
+    using Property =
+        Kokkos::Experimental::WorkItemProperty::ImplForceGlobalLaunch_t;
 #else
     using Property = Kokkos::Experimental::WorkItemProperty::None_t;
 #endif
@@ -1094,7 +1096,8 @@ struct TestComplexBesselI0K0Function {
 
     // Call Bessel functions
 #if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 4)
-    using Property = Kokkos::Experimental::WorkItemProperty::ImplForceGlobal_t;
+    using Property =
+        Kokkos::Experimental::WorkItemProperty::ImplForceGlobalLaunch_t;
 #else
     using Property = Kokkos::Experimental::WorkItemProperty::None_t;
 #endif
@@ -1334,7 +1337,8 @@ struct TestComplexBesselI1K1Function {
 
     // Call Bessel functions
 #if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 4)
-    using Property = Kokkos::Experimental::WorkItemProperty::ImplForceGlobal_t;
+    using Property =
+        Kokkos::Experimental::WorkItemProperty::ImplForceGlobalLaunch_t;
 #else
     using Property = Kokkos::Experimental::WorkItemProperty::None_t;
 #endif
@@ -1570,7 +1574,8 @@ struct TestComplexBesselH1Function {
 
     // Call Hankel functions
 #if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 4)
-    using Property = Kokkos::Experimental::WorkItemProperty::ImplForceGlobal_t;
+    using Property =
+        Kokkos::Experimental::WorkItemProperty::ImplForceGlobalLaunch_t;
 #else
     using Property = Kokkos::Experimental::WorkItemProperty::None_t;
 #endif

diff --git a/core/unit_test/TestViewSubview.hpp b/core/unit_test/TestViewSubview.hpp
@@ -152,7 +152,8 @@ void test_auto_1d() {
 
   fill_2D<mv_type, Space> f1(X, ONE);
 #if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 3)
-  using Property = Kokkos::Experimental::WorkItemProperty::ImplForceGlobal_t;
+  using Property =
+      Kokkos::Experimental::WorkItemProperty::ImplForceGlobalLaunch_t;
 #else
   using Property = Kokkos::Experimental::WorkItemProperty::None_t;
 #endif