format & renaming

Author: adurang

offload/cmake/Modules/LibomptargetGetDependencies.cmake

@@ -92,13 +92,13 @@ endif()
 ################################################################################
 # Looking for Level0
 ################################################################################
-find_path(LIBOMPTARGET_DEP_LEVEL_ZERO_INCLUDE_DIRS NAMES level_zero/ze_api.h)
+find_path(LIBOMPTARGET_DEP_LEVEL_ZERO_INCLUDE_DIR NAMES level_zero/ze_api.h)
 
-if(NOT LIBOMPTARGET_DEP_LEVEL_ZERO_INCLUDE_DIRS)
+if(NOT LIBOMPTARGET_DEP_LEVEL_ZERO_INCLUDE_DIR)
   set(LIBOMPTARGET_DEP_LEVEL_ZERO_FOUND FALSE)
 else()
   set(LIBOMPTARGET_DEP_LEVEL_ZERO_FOUND TRUE)
-  find_library(LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARIES NAMES ze_loader)
+  find_library(LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARY NAMES ze_loader)
 endif()
 
 set(OPENMP_PTHREAD_LIB ${LLVM_PTHREAD_LIB})

offload/plugins-nextgen/level_zero/CMakeLists.txt

@@ -25,12 +25,13 @@ target_include_directories(omptarget.rtl.level_zero PRIVATE
 
 target_include_directories(omptarget.rtl.level_zero PRIVATE
   ${LIBOMPTARGET_INCLUDE_DIR}
-  ${LIBOMPTARGET_DEP_LEVEL_ZERO_INCLUDE_DIRS}
+  ${LIBOMPTARGET_DEP_LEVEL_ZERO_INCLUDE_DIR}
   ${LIBOMPTARGET_LLVM_INCLUDE_DIRS}
   ${LIBOMPTARGET_OMP_HEADER_DIR}
 )
 
-if (EXISTS ${LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARIES} AND NOT "level_zero" IN_LIST LIBOMPTARGET_DLOPEN_PLUGINS)
+cmake_path(GET LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARY FILENAME LEVEL_ZERO_LIBRARY_NAME)
+if (EXISTS ${LIBOMPTARGET_DEP_LEVEL_ZERO_LIBRARY} AND NOT "level_zero" IN_LIST LIBOMPTARGET_DLOPEN_PLUGINS)
   message(STATUS "Building Level Zero NG plugin linked against level_zero library")
  if(UNIX)
     target_link_libraries(omptarget.rtl.level_zero PRIVATE

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

@@ -574,7 +574,8 @@ 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::NUM_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());