Cherry-picks to fix builds with changes to build images (#7847)

Since we last built this branch there have been various changes to the
compilers and build images we use that require code updates to allow
this to continue building.

These changes impact our testing / building, or guide type checking in the compiler, and so are NFC as far as the product is concerned.

### Workaround broken ARM64X / MSVC_BUILD_AS_X builds (#7827)
(cherry picked from commit ea7e910)

### Use WARP from nuget by default (#7427)
(cherry picked from commit 33dd542)
Manually moved changes from HlslExecTestUtils.h into ExecutionTest.cpp

### Add hctbuild.cmd parameter to specify the nuget config file (#7785)
(cherry picked from commit 06dcb00)

### Change type of DiagnosticHandlerTy
(cherry picked from commit b05a11a)

### Type safe version of MachinePassRegistry
(cherry picked from commit 4ddee81)

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Justin Bogner <[email protected]>
Co-authored-by: Serge Guelton <[email protected]>

Author: 4 people

azure-pipelines.yml

@@ -44,8 +44,8 @@ stages:
       displayName: 'DXIL Tests'
     - script: |
         call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
-        call utils\hct\hcttest.cmd -$(configuration) exec-warp
-      displayName: 'DXIL Execution Tests (Nuget WARP)'
+        call utils\hct\hcttest.cmd -$(configuration) exec
+      displayName: 'DXIL Execution Tests'
 
   - job: Nix
     timeoutInMinutes: 120

cmake/modules/AddLLVM.cmake

@@ -222,11 +222,35 @@ function(set_output_directory target bindir libdir)
     set(moddir ${libdir})
   endif()
   if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+    # HLSL change begin: work around broken MSVC_BUILD_AS_X
+    get_target_property(target_type ${target} TYPE)
+    if(target_type STREQUAL "SHARED_LIBRARY" AND MSVC_BUILD_AS_X EQUAL 1)
+      set(arm64x_workaround 1)
+      message(NOTICE "Working around ARM64X / MSVC_BUILD_AS_X bug for ${target}")
+    else()
+      set(arm64x_workaround 0)
+    endif()
+    # HLSL change end
+
     foreach(build_mode ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER "${build_mode}" CONFIG_SUFFIX)
       string(REPLACE ${CMAKE_CFG_INTDIR} ${build_mode} bi ${bindir})
       string(REPLACE ${CMAKE_CFG_INTDIR} ${build_mode} li ${libdir})
       string(REPLACE ${CMAKE_CFG_INTDIR} ${build_mode} mi ${moddir})
+
+      # HLSL change begin: work around broken MSVC_BUILD_AS_X
+      #
+      # MSVC_BUILD_AS_X generates a vcxproj that builds for both ARM64 and
+      # ARM64EC, but these two platforms are only visible in msbuild. It also
+      # currently configures the import libraries to all be output to the same
+      # location, which means it's a race for if we get the ARM64 or ARM64X
+      # version there.  The appended $(PLATFORM) is evaluated by msbuild at
+      # build time to separate the ARM64EC from ARM64 builds.
+      if(arm64x_workaround EQUAL 1)
+        string(APPEND li "/$(PLATFORM)")
+      endif()
+      # HLSL change end
+
       set_target_properties(${target} PROPERTIES "RUNTIME_OUTPUT_DIRECTORY_${CONFIG_SUFFIX}" ${bi})
       set_target_properties(${target} PROPERTIES "ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_SUFFIX}" ${li})
       set_target_properties(${target} PROPERTIES "LIBRARY_OUTPUT_DIRECTORY_${CONFIG_SUFFIX}" ${mi})

cmake/modules/Nuget.cmake

@@ -81,7 +81,7 @@ class PrintDiagnosticContext {
   bool HasWarnings() const;
   void Handle(const llvm::DiagnosticInfo &DI);
 
-  static void PrintDiagnosticHandler(const llvm::DiagnosticInfo &DI,
+  static void PrintDiagnosticHandler(const llvm::DiagnosticInfo *DI,
                                      void *Context);
 };