Generate dll names to lib_names.h

Remove some not needed ifdef blocks

Change-Id: I29f787bde819a2f19312dd5713df0d4534a47cd8

CMakeLists.txt

@@ -209,6 +209,11 @@ if(NOT IGC__IGC_TARGETS)
     add_subdirectory("${IGC_DIR}" "${IGDRCL_BUILD_DIR}/igc" EXCLUDE_FROM_ALL)
 endif()
 
+if(WIN32)
+    set(IGC_LIBRARY_NAME "igc${NEO_BITS}")
+    set(FCL_LIBRARY_NAME "igdfcl${NEO_BITS}")
+endif()
+
 set(IGDRCL__IGC_TARGETS "${IGC__IGC_TARGETS}")
 foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
     list(APPEND IGDRCL__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
@@ -248,7 +253,7 @@ endif()
 
 set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMMUMD_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
 
-set(GMM_LIB_FILENAME "igdgmm${NEO_BITS}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+set(GMM_LIBRARY_NAME "igdgmm${NEO_BITS}")
 
 macro(copy_gmm_dll_for target)
   if(WIN32 AND NOT USE_STATIC_GMM)
@@ -282,6 +287,11 @@ else()
     message(STATUS "Instrumentation library name: ${INSTRUMENTATION_LIB_NAME}")
 endif()
 
+set(SLD_LIBRARY_NAME "igfxdbgxchg")
+if(NEO_BITS STREQUAL "64")
+  set(SLD_LIBRARY_NAME "${SLD_LIBRARY_NAME}${NEO_BITS}")
+endif()
+
 add_subdirectory(third_party/gtest)
 
 add_definitions(-DGMM_OCL)
@@ -551,6 +561,5 @@ endif(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
 include(package.cmake)
 
 configure_file(config.h.in ${IGDRCL_BUILD_DIR}/config.h)
-configure_file(compiler.config.h.in ${IGDRCL_BUILD_DIR}/compiler.config.h)
 configure_file(driver_version.h.in ${IGDRCL_BUILD_DIR}/driver_version.h) # Put Driver version into define
 configure_file(lib_names.h.in ${IGDRCL_BUILD_DIR}/lib_names.h)

config.h.in

@@ -31,5 +31,6 @@ static const bool clCacheEnabled = false;
 #endif
 
 #cmakedefine CL_CACHE_LOCATION "${CL_CACHE_LOCATION}"
+#cmakedefine NEO_ARCH "${NEO_ARCH}"
 
 #endif /* CONFIG_H */

lib_names.h.in

@@ -20,9 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef LIB_NAMES_H
+#pragma once
-#define LIB_NAMES_H
 
-#cmakedefine GMM_LIB_FILENAME "${GMM_LIB_FILENAME}"
+#cmakedefine FCL_LIBRARY_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${FCL_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
-
+#cmakedefine GMM_LIBRARY_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${GMM_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
-#endif /* LIB_NAMES_H */
+#cmakedefine IGC_LIBRARY_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${IGC_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+#cmakedefine SLD_LIBRARY_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${SLD_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"

runtime/dll/linux/options.cpp

@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "compiler.config.h"
+#include "lib_names.h"
 #include "runtime/os_interface/os_library.h"
 
 namespace Os {

runtime/dll/windows/options.cpp

@@ -22,14 +22,9 @@
 #include "lib_names.h"
 
 namespace Os {
-#if defined(_WIN64)
-const char *frontEndDllName = "igdfcl64.dll";
-const char *igcDllName = "igc64.dll";
-#else
-const char *frontEndDllName = "igdfcl32.dll";
-const char *igcDllName = "igc32.dll";
-#endif
 
+const char *frontEndDllName = FCL_LIBRARY_NAME;
+const char *igcDllName = IGC_LIBRARY_NAME;
 const char *gdiDllName = "gdi32.dll";
-const char *gmmDllName = GMM_LIB_FILENAME;
+const char *gmmDllName = GMM_LIBRARY_NAME;
 } // namespace Os

runtime/os_interface/linux/CMakeLists.txt

@@ -58,7 +58,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.h
   ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_linux.cpp
 )
 
 if(UNIX)

runtime/os_interface/linux/source_level_debugger_linux.cpp

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "runtime/source_level_debugger/source_level_debugger.h"
-
-const char *OCLRT::SourceLevelDebugger::dllName = "libigfxdbgxchg64.so";

runtime/os_interface/windows/CMakeLists.txt

@@ -63,7 +63,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/registry_reader.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_windows.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls.h
   ${CMAKE_CURRENT_SOURCE_DIR}/thk_wrapper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm_32bit_memory.cpp

runtime/os_interface/windows/source_level_debugger_windows.cpp

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "runtime/source_level_debugger/source_level_debugger.h"
-
-#if defined(_WIN64)
-const char *OCLRT::SourceLevelDebugger::dllName = "igfxdbgxchg64.dll";
-#else
-const char *OCLRT::SourceLevelDebugger::dllName = "igfxdbgxchg.dll";
-#endif

runtime/source_level_debugger/source_level_debugger.cpp

@@ -26,6 +26,7 @@
 #include "runtime/program/kernel_info.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"
 #include "runtime/os_interface/os_interface.h"
+#include "lib_names.h"
 
 namespace OCLRT {
 const char *SourceLevelDebugger::notifyNewDeviceSymbol = "notifyNewDevice";
@@ -35,6 +36,7 @@ const char *SourceLevelDebugger::notifyKernelDebugDataSymbol = "notifyKernelDebu
 const char *SourceLevelDebugger::initSymbol = "init";
 const char *SourceLevelDebugger::isDebuggerActiveSymbol = "isDebuggerActive";
 const char *SourceLevelDebugger::notifyDeviceDestructionSymbol = "notifyDeviceDestruction";
+const char *SourceLevelDebugger::dllName = SLD_LIBRARY_NAME;
 
 class SourceLevelDebugger::SourceLevelDebuggerInterface {
   public:

unit_tests/helpers/test_files.cpp

@@ -21,12 +21,9 @@
  */
 
 #include "test_files.h"
+#include "config.h"
 
-#if defined(__LP64__) || (_WIN64)
+std::string testFiles("test_files/" NEO_ARCH "/");
-std::string testFiles("test_files/x64/");
-#else
-std::string testFiles("test_files/x86/");
-#endif
 std::string clFiles("test_files/");
 std::string binaryNameSuffix("");
 

unit_tests/main.cpp

@@ -409,7 +409,7 @@ int main(int argc, char **argv) {
 #else
     SetUnhandledExceptionFilter(&UltExceptionFilter);
     if (!useMockGmm) {
-        Os::gmmDllName = GMM_LIB_FILENAME;
+        Os::gmmDllName = GMM_LIBRARY_NAME;
     }
 #endif
     initializeTestHelpers();