tidy up Makefile

Author: adurang

offload/plugins-nextgen/level_zero/CMakeLists.txt

@@ -32,37 +32,25 @@ target_include_directories(omptarget.rtl.level_zero PRIVATE
 
 if (EXISTS ${LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARIES} AND NOT "level_zero" IN_LIST LIBOMPTARGET_DLOPEN_PLUGINS)
   message(STATUS "Building Level Zero NG plugin linked against level_zero library")
-
-  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ if(UNIX)
     target_link_libraries(omptarget.rtl.level_zero PRIVATE
-                        ${LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARIES})
-  elseif(CMAKE_SYSTEM_NAME MATCHES "Windows")
-    # Full path to the L0 library is recognized as a linker option, so we
+        ${LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARY})
+  elseif(WIN32)
+    # Full path to the Level Zero library is recognized as a linker option, so we
     # separate directory and file name
-    get_filename_component(LEVEL_ZERO_LIBRARY_PATH
-                           ${LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARIES} DIRECTORY)
-    get_filename_component(LEVEL_ZERO_LIBRARY_NAME
-                           ${LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARIES} NAME)
-    target_link_libraries(omptarget.rtl.level_zero PRIVATE
-                          ${LEVEL_ZERO_LIBRARY_NAME} ${LIBOMP_LIB_FILE})
-    target_link_directories(omptarget.rtl.level_zero PRIVATE 
-                            ${LEVEL_ZERO_LIBRARY_PATH})
-    target_link_options(omptarget.rtl.level_zero PRIVATE 
-                        "LINKER:-def:${CMAKE_CURRENT_SOURCE_DIR}/src/rtl.def")
-    libomptarget_add_resource_file(omptarget.rtl.level_zero)
+    cmake_path(GET LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARY PARENT_PATH LEVEL_ZERO_LIBRARY_PATH)
+    target_link_libraries(omptarget.rtl.level_zero PRIVATE ${LEVEL_ZERO_LIBRARY_NAME}
+        ${LIBOMP_LIB_FILE})
+    target_link_directories(omptarget.rtl.level_zero PRIVATE ${LEVEL_ZERO_LIBRARY_PATH})
   else()
     message(FATAL_ERROR "Missing platform support")
   endif()
 else()
   message(STATUS "Building Level Zero NG plugin for dlopened level_zero")
-  get_filename_component(LEVEL_ZERO_LIBRARY_NAME 
-                         ${LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARIES} NAME)
-  if(CMAKE_SYSTEM_NAME MATCHES "Windows")
-    # Windows uses dll instead of lib files at runtime
-    string(REGEX REPLACE "lib$" "dll" LEVEL_ZERO_LIBRARY_NAME 
-           ${LEVEL_ZERO_LIBRARY_NAME})
+  if(WIN32)
+    cmake_path(REPLACE_EXTENSION LEVEL_ZERO_LIBRARY_NAME dll)
   endif()
-  target_compile_options(omptarget.rtl.level_zero PRIVATE 
-                         "-DLEVEL_ZERO_LIBRARY=\"${LEVEL_ZERO_LIBRARY_NAME}\"")
+  target_compile_definitions(omptarget.rtl.level_zero PRIVATE
+      LEVEL_ZERO_LIBRARY="${LEVEL_ZERO_LIBRARY_NAME}")
   target_sources(omptarget.rtl.level_zero PRIVATE src/L0DynWrapper.cpp)
 endif()

offload/plugins-nextgen/level_zero/src/L0Device.cpp

@@ -574,14 +574,14 @@ Expected<InfoTreeNode> L0DeviceTy::obtainInfoImpl() {
     Info.add("Driver Version", "Unknown", "", DeviceInfo::DRIVER_VERSION);
   Info.add("Device PCI ID", getPCIId());
   Info.add("Device UUID", getUuid().data());
-  Info.add("Number of total EUs", getNumEUs(), "", DeviceInfo::MAX_COMPUTE_UNITS);
+  Info.add("Number of total EUs", getNumEUs(), "", DeviceInfo::NUM_COMPUTE_UNITS);
   Info.add("Number of threads per EU", getNumThreadsPerEU());
   Info.add("EU SIMD width", getSIMDWidth());
   Info.add("Number of EUs per subslice", getNumEUsPerSubslice());
   Info.add("Number of subslices per slice", getNumSubslicesPerSlice());
   Info.add("Number of slices", getNumSlices());
   Info.add("Max Group size", getMaxGroupSize(), "",
-           DeviceInfo::MAX_GROUP_WORK_SIZE);
+           DeviceInfo::MAX_WORK_GROUP_SIZE);
   Info.add("Local memory size (bytes)", getMaxSharedLocalMemory());
   Info.add("Global memory size (bytes)", getGlobalMemorySize(), "",
            DeviceInfo::GLOBAL_MEM_SIZE);