Merge pull request #5045 from pow2clk/cp-release-1.7.2212

Merge relevant changes into release 1.7.2212

7ce4986 Fix opt.exe external lib loading (#5049)
8f4d1f4 PIX: DxcPixDxilInstructionOffsets should operate on libs (#5046)
0795b94 Fix AppVeyor Linux tests failing loading dxil.so (#5024)
6d3574a Remove SO version from unix binaries (#5010)
6d480fd Allow libdxcompiler.so and dxc to find libdxil.so (#5004)
d751bd8 Correct WinAdapter path assumptions in public headers (#5003)
484f1b0 Fix instruction order issue in scalarizer (#5001)
d9d83d0 Fix two issues found in our internal build (#5002)
c8603e4 Added a workaround for PDBs with empty defines. (#4945)
073d860 [bug] Fix memory leak in dxil validator (#4966)
87fc5b5 PIX: Symbol manager: don't allow static members to contribute to member offsets (#4952)
8588ecb Turn off structurize-returns when cleanup blocks are present. (#4927)
bac7aa7 build: disable LLVM_ENABLE_TERMINFO by default. (#4908)

Author: Greg Roth

CMakeLists.txt

@@ -608,6 +608,7 @@ endif()
 
 include_directories( ${LLVM_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR})
 
+include_directories( ${LLVM_MAIN_INCLUDE_DIR}/dxc/Support) # HLSL Change
 include_directories( ${LLVM_INCLUDE_DIR}/dxc/Tracing) # HLSL Change
 
 # when crosscompiling import the executable targets from a file

cmake/caches/PredefinedParams.cmake

@@ -22,19 +22,20 @@ set(LLVM_INCLUDE_TESTS ${LLVM_TEST_VALUE} CACHE BOOL "")
 set(CLANG_INCLUDE_TESTS ${LLVM_TEST_VALUE} CACHE BOOL "")
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "")
-set(LLVM_APPEND_VC_REV ON CACHE BOOL "") 
+set(LLVM_APPEND_VC_REV ON CACHE BOOL "")
 set(LLVM_DEFAULT_TARGET_TRIPLE "dxil-ms-dx" CACHE STRING "")
-set(LLVM_ENABLE_EH ON CACHE BOOL "") 
-set(LLVM_ENABLE_RTTI ON CACHE BOOL "") 
-set(LLVM_INCLUDE_DOCS OFF CACHE BOOL "") 
-set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "") 
-set(LLVM_OPTIMIZED_TABLEGEN OFF CACHE BOOL "") 
+set(LLVM_ENABLE_EH ON CACHE BOOL "")
+set(LLVM_ENABLE_RTTI ON CACHE BOOL "")
+set(LLVM_INCLUDE_DOCS OFF CACHE BOOL "")
+set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "")
+set(LLVM_OPTIMIZED_TABLEGEN OFF CACHE BOOL "")
 set(LLVM_TARGETS_TO_BUILD "None" CACHE STRING "")
-set(LIBCLANG_BUILD_STATIC ON CACHE BOOL "") 
-set(CLANG_BUILD_EXAMPLES OFF CACHE BOOL "") 
-set(CLANG_CL OFF CACHE BOOL "") 
-set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "") 
-set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "") 
-set(HLSL_INCLUDE_TESTS ON CACHE BOOL "") 
-set(ENABLE_SPIRV_CODEGEN ON CACHE BOOL "") 
+set(LIBCLANG_BUILD_STATIC ON CACHE BOOL "")
+set(CLANG_BUILD_EXAMPLES OFF CACHE BOOL "")
+set(CLANG_CL OFF CACHE BOOL "")
+set(CLANG_ENABLE_ARCMT OFF CACHE BOOL "")
+set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "")
+set(HLSL_INCLUDE_TESTS ON CACHE BOOL "")
+set(ENABLE_SPIRV_CODEGEN ON CACHE BOOL "")
 set(SPIRV_BUILD_TESTS ON CACHE BOOL "")
+set(LLVM_ENABLE_TERMINFO OFF CACHE BOOL "")

cmake/modules/AddLLVM.cmake

@@ -446,10 +446,20 @@ function(llvm_add_library name)
         )
     endif()
 
+    # HLSL Change Begin - Don't generate so versioned files.
     set_target_properties(${name}
       PROPERTIES
       SOVERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}
-      VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX})
+      VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}
+      NO_SONAME On)
+    if (APPLE)
+      set_property(TARGET ${name} APPEND_STRING PROPERTY
+                   LINK_FLAGS " -Wl,-install_name,@rpath/${CMAKE_SHARED_LIBRARY_PREFIX}${name}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    elseif(UNIX)
+      set_property(TARGET ${name} APPEND_STRING PROPERTY
+                   LINK_FLAGS " -Wl,-soname,${CMAKE_SHARED_LIBRARY_PREFIX}${name}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    endif()
+    # HLSL Change End - Don't generate so versioned files.
   endif()
 
   if(ARG_MODULE OR ARG_SHARED)

include/dxc/Support/dxcapi.use.h

@@ -16,42 +16,41 @@
 
 namespace dxc {
 
+  extern const char* kDxCompilerLib;
+  extern const char* kDxilLib;
+
 // Helper class to dynamically load the dxcompiler or a compatible libraries.
 class DxcDllSupport {
 protected:
   HMODULE m_dll;
   DxcCreateInstanceProc m_createFn;
   DxcCreateInstance2Proc m_createFn2;
 
-  HRESULT InitializeInternal(LPCWSTR dllName, LPCSTR fnName) {
+  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName) {
     if (m_dll != nullptr) return S_OK;
 
 #ifdef _WIN32
-    m_dll = LoadLibraryW(dllName);
-#else
-    char nameStr[256];
-    std::wcstombs(nameStr, dllName, 256);
-    m_dll = ::dlopen(nameStr, RTLD_LAZY);
-#endif
-
+    m_dll = LoadLibraryA(dllName);
     if (m_dll == nullptr) return HRESULT_FROM_WIN32(GetLastError());
-
-#ifdef _WIN32
     m_createFn = (DxcCreateInstanceProc)GetProcAddress(m_dll, fnName);
-#else
-    m_createFn = (DxcCreateInstanceProc)::dlsym(m_dll, fnName);
-#endif
-
+    
     if (m_createFn == nullptr) {
       HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
-#ifdef _WIN32
       FreeLibrary(m_dll);
+      m_dll = nullptr;
+      return hr;
+    }
 #else
+    m_dll = ::dlopen(dllName, RTLD_LAZY);
+    if (m_dll == nullptr) return E_FAIL;
+    m_createFn = (DxcCreateInstanceProc)::dlsym(m_dll, fnName);
+    
+    if (m_createFn == nullptr) {
       ::dlclose(m_dll);
-#endif
       m_dll = nullptr;
-      return hr;
+      return E_FAIL;
     }
+#endif
 
     // Only basic functions used to avoid requiring additional headers.
     m_createFn2 = nullptr;
@@ -86,16 +85,10 @@ class DxcDllSupport {
   }
 
   HRESULT Initialize() {
-    #ifdef _WIN32
-    return InitializeInternal(L"dxcompiler.dll", "DxcCreateInstance");
-    #elif __APPLE__
-    return InitializeInternal(L"libdxcompiler.dylib", "DxcCreateInstance");
-    #else
-    return InitializeInternal(L"libdxcompiler.so", "DxcCreateInstance");
-    #endif
+    return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
   }
 
-  HRESULT InitializeForDll(_In_z_ const wchar_t* dll, _In_z_ const char* entryPoint) {
+  HRESULT InitializeForDll(_In_z_ LPCSTR dll, _In_z_ LPCSTR entryPoint) {
     return InitializeInternal(dll, entryPoint);
   }
 

include/dxc/dxcapi.h

@@ -34,7 +34,7 @@
 #else
 
 #include <dlfcn.h>
-#include "dxc/Support/WinAdapter.h"
+#include "WinAdapter.h"
 #endif
 
 struct IMalloc;

include/dxc/dxcisense.h

@@ -14,7 +14,7 @@
 
 #include "dxcapi.h"
 #ifndef _WIN32
-#include "Support/WinAdapter.h"
+#include "WinAdapter.h"
 #endif
 
 typedef enum DxcGlobalOptions

lib/DxcSupport/CMakeLists.txt

@@ -11,4 +11,12 @@ add_llvm_library(LLVMDxcSupport
   WinFunctions.cpp
   )
 
+#generate header with platform-specific library name
+configure_file(
+${LLVM_MAIN_SRC_DIR}/lib/DxcSupport/SharedLibAffix.inc
+SharedLibAffix.h
+)
+
+include_directories( ${LLVM_INCLUDE_DIR}/DxcSupport) #needed to find the generated header
+
 add_dependencies(LLVMDxcSupport TablegenHLSLOptions)

lib/DxcSupport/HLSLOptions.cpp

@@ -1183,9 +1183,8 @@ int SetupDxcDllSupport(const DxcOpts &opts, dxc::DxcDllSupport &dxcSupport,
                        llvm::raw_ostream &errors) {
   if (!opts.ExternalLib.empty()) {
     DXASSERT(!opts.ExternalFn.empty(), "else ReadDxcOpts should have failed");
-    StringRefWide externalLib(opts.ExternalLib);
     HRESULT hrLoad =
-        dxcSupport.InitializeForDll(externalLib, opts.ExternalFn.data());
+      dxcSupport.InitializeForDll(opts.ExternalLib.data(), opts.ExternalFn.data());
     if (DXC_FAILED(hrLoad)) {
       errors << "Unable to load support for external DLL " << opts.ExternalLib
              << " with function " << opts.ExternalFn << " - error 0x";

lib/DxcSupport/SharedLibAffix.inc

@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+//                                                                           //
+// SharedLibAffix.inc                                                        //
+// Copyright (C) Microsoft Corporation. All rights reserved.                 //
+// This file is distributed under the University of Illinois Open Source     //
+// License. See LICENSE.TXT for details.                                     //
+//                                                                           //
+// Defines shared library prefixes and suffixes for the build platform.      //
+//                                                                           //
+///////////////////////////////////////////////////////////////////////////////
+
+
+#pragma once
+
+#cmakedefine CMAKE_SHARED_LIBRARY_PREFIX "@CMAKE_SHARED_LIBRARY_PREFIX@"
+#cmakedefine CMAKE_SHARED_LIBRARY_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@"
+
+#ifndef CMAKE_SHARED_LIBRARY_PREFIX
+#define CMAKE_SHARED_LIBRARY_PREFIX
+#endif
+
+#ifndef CMAKE_SHARED_LIBRARY_SUFFIX
+#define CMAKE_SHARED_LIBRARY_SUFFIX
+#endif

lib/DxcSupport/dxcapi.use.cpp

@@ -15,9 +15,13 @@
 #include "dxc/Support/Unicode.h"
 #include "dxc/Support/FileIOHelper.h"
 #include "dxc/Support/WinFunctions.h"
+#include "SharedLibAffix.h"
 
 namespace dxc {
 
+const char* kDxCompilerLib = CMAKE_SHARED_LIBRARY_PREFIX "dxcompiler" CMAKE_SHARED_LIBRARY_SUFFIX;
+const char* kDxilLib = CMAKE_SHARED_LIBRARY_PREFIX "dxil" CMAKE_SHARED_LIBRARY_SUFFIX;
+
 #ifdef _WIN32
 static void TrimEOL(_Inout_z_ char *pMsg) {
   char *pEnd = pMsg + strlen(pMsg);