Merge fixes from os integration 486b3dc5abee (#306)

* Change to DxilProgramSigSemantic::Barycentrics for runtime alignment
* Integrate os change e4aba062897e
  - fix in Hashing.h for thread unsafe static
* Change to DxilProgramSigSemantic::Barycentrics for runtime alignment
* Disable ViewID Debug output and initialize ViewID feature flag
* Clean up some CMakeLists.txt lib changes

include/dxc/HLSL/DxilContainer.h

@@ -143,6 +143,7 @@ enum class DxilProgramSigMinPrecision : uint32_t {
   Any10 = 0xf1
 };
 
+// Corresponds to D3D_NAME and D3D10_SB_NAME
 enum class DxilProgramSigSemantic : uint32_t {
   Undefined = 0,
   Position = 1,
@@ -161,6 +162,7 @@ enum class DxilProgramSigSemantic : uint32_t {
   FinalTriInsideTessfactor = 14,
   FinalLineDetailTessfactor = 15,
   FinalLineDensityTessfactor = 16,
+  Barycentrics = 23,
   Target = 64,
   Depth = 65,
   Coverage = 66,
@@ -168,7 +170,6 @@ enum class DxilProgramSigSemantic : uint32_t {
   DepthLE = 68,
   StencilRef = 69,
   InnerCoverage = 70,
-  Barycentrics = 71
 };
 
 enum class DxilProgramSigCompType : uint32_t {

include/llvm/ADT/Hashing.h

@@ -327,7 +327,7 @@ inline size_t get_execution_seed() {
   // However, if there is a fixed seed override set the first time this is
   // called, return that instead of the per-execution seed.
   const uint64_t seed_prime = 0xff51afd7ed558ccdULL;
-  static size_t seed = fixed_seed_override ? fixed_seed_override
+  size_t seed = fixed_seed_override ? fixed_seed_override
                                            : (size_t)seed_prime;
   return seed;
 }

lib/HLSL/ComputeViewIdState.cpp

@@ -32,7 +32,7 @@ using llvm::legacy::PassManager;
 using llvm::legacy::FunctionPassManager;
 using std::vector;
 
-#define DXILVIEWID_DBG   1
+#define DXILVIEWID_DBG   0
 
 #define DEBUG_TYPE "viewid"
 

lib/HLSL/DxilModule.cpp

@@ -121,6 +121,7 @@ DxilModule::ShaderFlags::ShaderFlags():
 , m_bROVS(false)
 , m_bWaveOps(false)
 , m_bInt64Ops(false)
+, m_bViewID(false)
 , m_align0(0)
 , m_align1(0)
 {}

tools/clang/tools/dxcompiler/CMakeLists.txt

@@ -68,7 +68,6 @@ set(LIBRARIES
   clangTooling
   clangBasic
   libclang
-  LLVMHLSL
   )
 
 set(GENERATED_HEADERS

tools/clang/unittests/HLSL/CMakeLists.txt

@@ -12,6 +12,7 @@ set( LLVM_LINK_COMPONENTS
   option
   bitwriter
   analysis
+  ipa
   )
 
 add_clang_library(clang-hlsl-tests SHARED
@@ -44,7 +45,6 @@ target_link_libraries(clang-hlsl-tests PRIVATE
   ${TAEF_LIBRARIES}
   ${DIASDK_LIBRARIES}
   ${D3D12_LIBRARIES}
-  LLVMipa
   )
 
 # Add includes for platform helpers and dxc API.