Remove the functinal form of 'assertOnGpu'

It has been deprecated for a year now Signed-off-by: Danila Fedorin <[email protected]>
chapel-lang · Aug 30, 2024 · c7ddb4d · c7ddb4d
1 parent d301f0a
commit c7ddb4d
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 167 deletions.
diff --git a/compiler/optimizations/gpuTransforms.cpp b/compiler/optimizations/gpuTransforms.cpp
@@ -414,13 +414,7 @@ class GpuAssertionReporter {
     if (assertion->isPrimitive(PRIM_ASSERT_GPU_ELIGIBLE)) {
       reason = "is marked with @gpu.assertEligible";
     } else {
-      INT_ASSERT(assertion->isPrimitive(PRIM_ASSERT_ON_GPU));
-      reason = "contains assertOnGpu()";
-      auto isAttributeSym = toSymExpr(assertion->get(1));
-      INT_ASSERT(isAttributeSym);
-      if (isAttributeSym->symbol() == gTrue) {
-        reason = "is marked with @assertOnGpu";
-      }
+      reason = "is marked with @assertOnGpu";
     }
     USR_FATAL_CONT(loc, "Loop %s but is not eligible for execution on a GPU", reason);
   }

diff --git a/modules/standard/AutoGpu.chpl b/modules/standard/AutoGpu.chpl
@@ -44,7 +44,7 @@ module AutoGpu {
                       "that the code can be executed on the GPU without ",
                       "runtime checks.");
     }
-    __primitive("chpl_assert_on_gpu", true);
+    __primitive("chpl_assert_on_gpu");
   }
 
   inline proc chpl__gpuBlockSizeAttr(param counter: int, arg: integral) {

diff --git a/modules/standard/GPU.chpl b/modules/standard/GPU.chpl
@@ -133,18 +133,6 @@ module GPU
     gpuWrite((...args), "\n":c_ptrConst(c_char));
   }
 
-  /*
-    Will halt execution at runtime if called from outside a GPU.  If used on
-    first line in ``foreach`` or ``forall`` loop will also do a compile time
-    check that the loop is eligible for execution on a GPU.
-  */
-  pragma "insert line file info"
-  pragma "always propagate line file info"
-  @deprecated(notes="the functional form of assertOnGpu() is deprecated. Please use the @assertOnGpu loop attribute instead.")
-  inline proc assertOnGpu() {
-    __primitive("chpl_assert_on_gpu", false);
-  }
-
   /*
     Returns value of a per-multiprocessor counter that increments every clock cycle.
     This function is meant to be called to time sections of code within a GPU

diff --git a/test/gpu/native/assertOnFailToGpuize.1.good b/test/gpu/native/assertOnFailToGpuize.1.good
diff --git a/test/gpu/native/assertOnFailToGpuize.2.good b/test/gpu/native/assertOnFailToGpuize.2.good
diff --git a/test/gpu/native/assertOnFailToGpuize.3.good b/test/gpu/native/assertOnFailToGpuize.3.good
diff --git a/test/gpu/native/assertOnFailToGpuize.4.good b/test/gpu/native/assertOnFailToGpuize.4.good
diff --git a/test/gpu/native/assertOnFailToGpuize.chpl b/test/gpu/native/assertOnFailToGpuize.chpl
diff --git a/test/gpu/native/assertOnFailToGpuize.compopts b/test/gpu/native/assertOnFailToGpuize.compopts
diff --git a/test/users/engin/context/gpuSharedMem.chpl b/test/users/engin/context/gpuSharedMem.chpl
@@ -12,8 +12,8 @@ config const n = 20;
 on here.gpus[0] {
   var A : [0..<N] uint;
 
+  @assertOnGpu
   foreach i in simpleOneDim(N) {  // context should be coming from a new syntax
-    assertOnGpu();
     const context = new Context();
     const vectorContext = __primitive("outer context", context);