[SYCL] Export only *pi symbols in libpi_opencl.so

Cleaned up some unnecessary versioning code
Changed library scope from SHARED to MODULE to limit its usage
Moved duplicate code out of condition

Signed-off-by: Byoungro So <[email protected]>

Author: bso-intel

sycl/include/CL/sycl/detail/pi.h

@@ -46,7 +46,7 @@
 // elsewhere, e.g. in the pi_opencl, but constants/enums mapping is now
 // done here, for efficiency and simplicity.
 
-#include "export.hpp"
+#include <CL/sycl/detail/export.hpp>
 #include <CL/cl_usm_ext.h>
 #include <CL/sycl/detail/cl.h>
 #include <cstdint>

sycl/plugins/opencl/CMakeLists.txt

@@ -9,16 +9,14 @@
 #TODO: remove dependency on pi.hpp in sycl project.
 #TODO: Currently, the pi.hpp header is common between sycl and plugin library sources. 
 #This can be changed by copying the pi.hpp file in the plugins project.
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../source/version.rc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/version.rc
-  @ONLY)
 
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-add_library(pi_opencl SHARED
+
+# We chose MODULE type because libpi_opencl.so should never be linked dynamically to a target.
+# MODULE will limit this library to be used to load symbols via dllopen only
+add_library(pi_opencl MODULE
   "${sycl_inc_dir}/CL/sycl/detail/pi.h"
   "pi_opencl.cpp"
-  ${CMAKE_CURRENT_BINARY_DIR}/version.rc
   )
 
 add_dependencies(pi_opencl
@@ -33,13 +31,14 @@ set_target_properties(pi_opencl PROPERTIES LINKER_LANGUAGE CXX)
 #preprocessor definitions for compiling a target's sources. We do not need it for pi_opencl
 target_include_directories(pi_opencl PRIVATE "${sycl_inc_dir}")
 
+target_link_libraries( pi_opencl
+  PRIVATE OpenCL::Headers
+  PRIVATE ${OpenCL_LIBRARIES}
+)
 if (MSVC)
+  # by defining __SYCL_BUILD_SYCL_DLL, we can use __declspec(dllexport)
+  # which are individually tagged for all pi* symbols in pi_opencl.cpp
   target_compile_definitions(pi_opencl PRIVATE __SYCL_BUILD_SYCL_DLL)
-  target_link_libraries(pi_opencl PRIVATE shlwapi)
-  target_link_libraries( pi_opencl
-    PRIVATE OpenCL::Headers
-    PRIVATE ${OpenCL_LIBRARIES}
-  )
 else()
   # we set the visibility of all symbols 'hidden' by default.
   # In *.cpp files, we set exported symbols with visibility==default individually
@@ -51,8 +50,6 @@ else()
 
   #link pi_opencl with OpenCL headers and ICD Loader.
   target_link_libraries( pi_opencl
-    PRIVATE OpenCL::Headers
-    PRIVATE ${OpenCL_LIBRARIES}
     # Filter symbols based on the scope defined in the script file,
     # and export pi* function symbols in the library. 
     PRIVATE "-Wl,--version-script=${linker_script}"
@@ -61,9 +58,6 @@ endif()
 
 add_common_options(pi_opencl)
 
-set_target_properties(pi_opencl PROPERTIES
-                      VERSION ${SYCL_VERSION_STRING}
-                      SOVERSION ${SYCL_MAJOR_VERSION})
 install(TARGETS pi_opencl
     LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT pi_opencl
     RUNTIME DESTINATION "bin" COMPONENT pi_opencl)