[SYCL][UR][CUDA] Mirror SYCL_PI env vars with UR prefix (#10045)

Author: callumfare

common.cpp

@@ -39,7 +39,8 @@ ur_result_t checkErrorUR(CUresult Result, const char *Function, int Line,
     return UR_RESULT_SUCCESS;
   }
 
-  if (std::getenv("SYCL_PI_SUPPRESS_ERROR_MESSAGE") == nullptr) {
+  if (std::getenv("SYCL_PI_SUPPRESS_ERROR_MESSAGE") == nullptr &&
+      std::getenv("UR_SUPPRESS_ERROR_MESSAGE") == nullptr) {
     const char *ErrorString = nullptr;
     const char *ErrorName = nullptr;
     cuGetErrorName(Result, &ErrorName);
@@ -55,7 +56,8 @@ ur_result_t checkErrorUR(CUresult Result, const char *Function, int Line,
     std::cerr << SS.str();
   }
 
-  if (std::getenv("PI_CUDA_ABORT") != nullptr) {
+  if (std::getenv("PI_CUDA_ABORT") != nullptr ||
+      std::getenv("UR_CUDA_ABORT") != nullptr) {
     std::abort();
   }
 
@@ -68,7 +70,8 @@ ur_result_t checkErrorUR(ur_result_t Result, const char *Function, int Line,
     return UR_RESULT_SUCCESS;
   }
 
-  if (std::getenv("SYCL_PI_SUPPRESS_ERROR_MESSAGE") == nullptr) {
+  if (std::getenv("SYCL_PI_SUPPRESS_ERROR_MESSAGE") == nullptr &&
+      std::getenv("UR_SUPPRESS_ERROR_MESSAGE") == nullptr) {
     std::stringstream SS;
     SS << "\nUR ERROR:"
        << "\n\tValue:           " << Result

device.cpp

@@ -272,7 +272,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
   case UR_DEVICE_INFO_IMAGE_SUPPORTED: {
     bool Enabled = false;
 
-    if (std::getenv("SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT") != nullptr) {
+    if (std::getenv("SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT") != nullptr ||
+        std::getenv("UR_CUDA_ENABLE_IMAGE_SUPPORT") != nullptr) {
       Enabled = true;
     } else {
       detail::ur::cuPrint(

device.hpp

@@ -45,8 +45,13 @@ struct ur_device_handle_t_ {
         cuDevice));
 
     // Set local mem max size if env var is present
-    static const char *LocalMemSizePtr =
+    static const char *LocalMemSizePtrUR =
+        std::getenv("UR_CUDA_MAX_LOCAL_MEM_SIZE");
+    static const char *LocalMemSizePtrPI =
         std::getenv("SYCL_PI_CUDA_MAX_LOCAL_MEM_SIZE");
+    static const char *LocalMemSizePtr =
+        LocalMemSizePtrUR ? LocalMemSizePtrUR
+                          : (LocalMemSizePtrPI ? LocalMemSizePtrPI : nullptr);
 
     if (LocalMemSizePtr) {
       cuDeviceGetAttribute(

enqueue.cpp

@@ -397,8 +397,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
       // Set up local memory requirements for kernel.
       auto Device = hQueue->getContext()->getDevice();
       if (Device->getMaxChosenLocalMem() < 0) {
-        setErrorMessage("Invalid value specified for "
-                        "SYCL_PI_CUDA_MAX_LOCAL_MEM_SIZE",
+        bool EnvVarHasURPrefix =
+            (std::getenv("UR_CUDA_MAX_LOCAL_MEM_SIZE") != nullptr);
+        setErrorMessage(EnvVarHasURPrefix ? "Invalid value specified for "
+                                            "UR_CUDA_MAX_LOCAL_MEM_SIZE"
+                                          : "Invalid value specified for "
+                                            "SYCL_PI_CUDA_MAX_LOCAL_MEM_SIZE",
                         UR_RESULT_ERROR_ADAPTER_SPECIFIC);
         return UR_RESULT_ERROR_ADAPTER_SPECIFIC;
       }
@@ -408,10 +412,16 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
         return UR_RESULT_ERROR_ADAPTER_SPECIFIC;
       }
       if (LocalSize > static_cast<uint32_t>(Device->getMaxChosenLocalMem())) {
+        bool EnvVarHasURPrefix =
+            (std::getenv("UR_CUDA_MAX_LOCAL_MEM_SIZE") != nullptr);
         setErrorMessage(
-            "Local memory for kernel exceeds the amount requested using "
-            "SYCL_PI_CUDA_MAX_LOCAL_MEM_SIZE. Try increasing the value for "
-            "SYCL_PI_CUDA_MAX_LOCAL_MEM_SIZE.",
+            EnvVarHasURPrefix
+                ? "Local memory for kernel exceeds the amount requested using "
+                  "UR_CUDA_MAX_LOCAL_MEM_SIZE. Try increasing the value of "
+                  "UR_CUDA_MAX_LOCAL_MEM_SIZE."
+                : "Local memory for kernel exceeds the amount requested using "
+                  "SYCL_PI_CUDA_MAX_LOCAL_MEM_SIZE. Try increasing the the "
+                  "value of SYCL_PI_CUDA_MAX_LOCAL_MEM_SIZE.",
             UR_RESULT_ERROR_ADAPTER_SPECIFIC);
         return UR_RESULT_ERROR_ADAPTER_SPECIFIC;
       }