Changed init_attr migration logic

Author: TejaX-Alaghari

clang/lib/DPCT/RulesSHMEM/APINamesNvshmem.inc

@@ -203,13 +203,18 @@
 FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
                         CALL_FACTORY_ENTRY("nvshmem_init", CALL("ishmem_init")))
 
-HEADER_INSERT_FACTORY(HeaderType::HT_DPCT_SHMEM_Utils,
-                      FEATURE_REQUEST_FACTORY(
-                          HelperFeatureEnum::device_ext,
-                          CALL_FACTORY_ENTRY("nvshmemx_init_attr",
-                                             CALL(MapNames::getDpctNamespace() +
-                                                      "shmem::init_attr",
-                                                  ARG(0), ARG(1)))))
+HEADER_INSERT_FACTORY(
+    HeaderType::HT_DPCT_SHMEM_Utils,
+    FEATURE_REQUEST_FACTORY(
+        HelperFeatureEnum::device_ext,
+        CALL_FACTORY_ENTRY(
+            "nvshmemx_init_attr",
+            CALL(MapNames::getDpctNamespace() + "shmem::init_attr",
+                 makeCombinedArg(
+                     makeCombinedArg(
+                         ARG("static_cast<ishmemx_runtime_type_t>("), ARG(0)),
+                     ARG(")")),
+                 ARG(1)))))
 
 FEATURE_REQUEST_FACTORY(HelperFeatureEnum::device_ext,
                         CALL_FACTORY_ENTRY("nvshmem_my_pe",

clang/test/dpct/nvshmem/library_setup_exit_query.cu

@@ -60,21 +60,21 @@ int main() {
   attr.args = args;
 #endif // NO_BUILD_TEST
 
-  // CHECK: dpct::shmem::init_attr(ISHMEMX_RUNTIME_MPI, &attr);
-  // CHECK-NEXT: dpct::shmem::init_attr(ISHMEMX_RUNTIME_OPENSHMEM, &attr);
-  // CHECK-NEXT: dpct::shmem::init_attr(ISHMEMX_RUNTIME_MPI | ISHMEMX_RUNTIME_OPENSHMEM, &attr);
+  // CHECK: dpct::shmem::init_attr(static_cast<ishmemx_runtime_type_t>(ISHMEMX_RUNTIME_MPI), &attr);
+  // CHECK-NEXT: dpct::shmem::init_attr(static_cast<ishmemx_runtime_type_t>(ISHMEMX_RUNTIME_OPENSHMEM), &attr);
+  // CHECK-NEXT: dpct::shmem::init_attr(static_cast<ishmemx_runtime_type_t>(ISHMEMX_RUNTIME_MPI | ISHMEMX_RUNTIME_OPENSHMEM), &attr);
   nvshmemx_init_attr(NVSHMEMX_INIT_WITH_MPI_COMM, &attr);
   nvshmemx_init_attr(NVSHMEMX_INIT_WITH_SHMEM, &attr);
   nvshmemx_init_attr(NVSHMEMX_INIT_WITH_MPI_COMM | NVSHMEMX_INIT_WITH_SHMEM, &attr);
 
   // CHECK: unsigned int rt = ISHMEMX_RUNTIME_MPI;
   // CHECK-NEXT: rt = ISHMEMX_RUNTIME_OPENSHMEM;
-  // CHECK-NEXT: dpct::shmem::init_attr(rt, &attr);
+  // CHECK-NEXT: dpct::shmem::init_attr(static_cast<ishmemx_runtime_type_t>(rt), &attr);
   unsigned int rt = NVSHMEMX_INIT_WITH_MPI_COMM;
   rt = NVSHMEMX_INIT_WITH_SHMEM;
   nvshmemx_init_attr(rt, &attr);
 
-  // CHECK: dpct::shmem::init_attr(0, &attr);
+  // CHECK: dpct::shmem::init_attr(static_cast<ishmemx_runtime_type_t>(0), &attr);
   nvshmemx_init_attr(0, &attr);
 
   // CHECK: ishmem_init();