testing commit

oneapi-src · Nov 3, 2023 · ca4f87b · ca4f87b
1 parent ec44de3
commit ca4f87b
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 8 deletions.
diff --git a/scripts/generate_code.py b/scripts/generate_code.py
@@ -315,6 +315,25 @@ def _mako_info_hpp(path, namespace, tags, version, specs, meta):
         specs=specs,
         meta=meta)
 
+"""
+Entry-point:
+    generates linker version scripts
+"""
+def _mako_linker_scripts(path, ext, namespace, tags, version, specs, meta):
+    name = "adapter"
+    filename = f"{name}.{ext}.in"
+    fin = os.path.join(templates_dir, f"{filename}.mako")
+    fout = os.path.join(path, filename)
+    print("Generating %s..." % fout)
+    return util.makoWrite(
+        fin, fout,
+        name=name,
+        ver=version,
+        namespace=namespace,
+        tags=tags,
+        specs=specs,
+        meta=meta)
+
 """
 Entry-point:
     generates lib code

diff --git a/scripts/templates/adapter.def.in.mako b/scripts/templates/adapter.def.in.mako
@@ -0,0 +1,14 @@
+<%!
+import re
+from templates import helper as th
+%><%
+    n=namespace
+    N=n.upper()
+    x=tags['$x']
+    X=x.upper()
+%>
+LIBRARY @TARGET_LIBNAME@
+EXPORTS
+%for tbl in th.get_pfntables(specs, meta, n, tags):
+	${tbl['export']['name']}
+%endfor
diff --git a/scripts/templates/adapter.map.in.mako b/scripts/templates/adapter.map.in.mako
@@ -0,0 +1,17 @@
+<%!
+import re
+from templates import helper as th
+%><%
+    n=namespace
+    N=n.upper()
+    x=tags['$x']
+    X=x.upper()
+%>
+@TARGET_LIBNAME@ {
+	global:
+%for tbl in th.get_pfntables(specs, meta, n, tags):
+		${tbl['export']['name']};
+%endfor
+	local:
+		*;
+};
diff --git a/source/adapters/adapter.def.in b/source/adapters/adapter.def.in
@@ -1,20 +1,22 @@
 LIBRARY @TARGET_LIBNAME@
 EXPORTS
+	urGetGlobalProcAddrTable
 	urGetBindlessImagesExpProcAddrTable
 	urGetCommandBufferExpProcAddrTable
 	urGetContextProcAddrTable
-	urGetDeviceProcAddrTable
 	urGetEnqueueProcAddrTable
+	urGetEnqueueExpProcAddrTable
 	urGetEventProcAddrTable
-	urGetGlobalProcAddrTable
 	urGetKernelProcAddrTable
+	urGetKernelExpProcAddrTable
 	urGetMemProcAddrTable
 	urGetPhysicalMemProcAddrTable
 	urGetPlatformProcAddrTable
 	urGetProgramProcAddrTable
 	urGetQueueProcAddrTable
 	urGetSamplerProcAddrTable
+	urGetUSMProcAddrTable
 	urGetUSMExpProcAddrTable
 	urGetUsmP2PExpProcAddrTable
-	urGetUSMProcAddrTable
 	urGetVirtualMemProcAddrTable
+	urGetDeviceProcAddrTable
diff --git a/source/adapters/adapter.map.in b/source/adapters/adapter.map.in
@@ -1,23 +1,25 @@
 @TARGET_LIBNAME@ {
 	global:
+		urGetGlobalProcAddrTable;
 		urGetBindlessImagesExpProcAddrTable;
 		urGetCommandBufferExpProcAddrTable;
 		urGetContextProcAddrTable;
-		urGetDeviceProcAddrTable;
 		urGetEnqueueProcAddrTable;
+		urGetEnqueueExpProcAddrTable;
 		urGetEventProcAddrTable;
-		urGetGlobalProcAddrTable;
 		urGetKernelProcAddrTable;
+		urGetKernelExpProcAddrTable;
 		urGetMemProcAddrTable;
 		urGetPhysicalMemProcAddrTable;
 		urGetPlatformProcAddrTable;
 		urGetProgramProcAddrTable;
 		urGetQueueProcAddrTable;
 		urGetSamplerProcAddrTable;
+		urGetUSMProcAddrTable;
 		urGetUSMExpProcAddrTable;
 		urGetUsmP2PExpProcAddrTable;
-		urGetUSMProcAddrTable;
 		urGetVirtualMemProcAddrTable;
+		urGetDeviceProcAddrTable;
 	local:
 		*;
-};
+};
diff --git a/source/adapters/cuda/common.cpp b/source/adapters/cuda/common.cpp
@@ -111,7 +111,7 @@ void detail::ur::assertion(bool Condition, const char *Message) {
 }
 
 void detail::ur::cuPrint(const char *Message) {
-  std::cerr << "ur_print: " << Message << std::endl;
+  std::fprintf(stderr, "ur_print: %s\n", Message);
 }
 
 // Global variables for ZER_EXT_RESULT_ADAPTER_SPECIFIC_ERROR

diff --git a/source/adapters/cuda/ur_interface_loader.cpp b/source/adapters/cuda/ur_interface_loader.cpp
@@ -388,6 +388,26 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPhysicalMemProcAddrTable(
   return retVal;
 }
 
+UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
+    ur_api_version_t version, ur_enqueue_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  return UR_RESULT_SUCCESS;
+}
+
+UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
+    ur_api_version_t version, ur_kernel_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  return UR_RESULT_SUCCESS;
+}
+
 #if defined(__cplusplus)
 } // extern "C"
 #endif
diff --git a/source/adapters/hip/ur_interface_loader.cpp b/source/adapters/hip/ur_interface_loader.cpp
@@ -342,6 +342,26 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPhysicalMemProcAddrTable(
   return retVal;
 }
 
+UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
+    ur_api_version_t version, ur_enqueue_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  return UR_RESULT_SUCCESS;
+}
+
+UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
+    ur_api_version_t version, ur_kernel_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  return UR_RESULT_SUCCESS;
+}
+
 #if defined(__cplusplus)
 } // extern "C"
 #endif
diff --git a/source/adapters/level_zero/ur_interface_loader.cpp b/source/adapters/level_zero/ur_interface_loader.cpp
@@ -427,3 +427,23 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPhysicalMemProcAddrTable(
 
   return retVal;
 }
+
+UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
+    ur_api_version_t version, ur_enqueue_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  return UR_RESULT_SUCCESS;
+}
+
+UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
+    ur_api_version_t version, ur_kernel_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  return UR_RESULT_SUCCESS;
+}
diff --git a/source/adapters/opencl/ur_interface_loader.cpp b/source/adapters/opencl/ur_interface_loader.cpp
@@ -377,6 +377,26 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetPhysicalMemProcAddrTable(
   return retVal;
 }
 
+UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueExpProcAddrTable(
+    ur_api_version_t version, ur_enqueue_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  return UR_RESULT_SUCCESS;
+}
+
+UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelExpProcAddrTable(
+    ur_api_version_t version, ur_kernel_exp_dditable_t *pDdiTable) {
+  auto result = validateProcInputs(version, pDdiTable);
+  if (UR_RESULT_SUCCESS != result) {
+    return result;
+  }
+
+  return UR_RESULT_SUCCESS;
+}
+
 #if defined(__cplusplus)
 } // extern "C"
 #endif