Fix running execution tests on x86 (microsoft#7853)

* Updated FindTAEF to use correct names for x86 platforms (WIn32 and
X86)
* Updated DownloadWarp to pick appropriate version of WARP for the
target platform
* Updated taef.py to not use /inproc. This allows us to run x86 tests on
an x64 machine.

Author: damyanp

cmake/modules/FindTAEF.cmake

@@ -44,7 +44,7 @@ set(TAEF_SDK_BIN ${TAEF_INCLUDE_DIR}/../../Runtimes/TAEF)
 if ((CMAKE_GENERATOR_PLATFORM STREQUAL "x64") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "x64"))
   set(TAEF_BIN_ARCH "amd64")
   set(TAEF_ARCH "x64")
-elseif ((CMAKE_GENERATOR_PLATFORM STREQUAL "x86") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "x86"))
+elseif ((CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "X86"))
   set(TAEF_BIN_ARCH "x86")
   set(TAEF_ARCH "x86")
 elseif ((CMAKE_GENERATOR_PLATFORM MATCHES "ARM64.*") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" MATCHES "ARM64.*"))
@@ -53,7 +53,12 @@ elseif ((CMAKE_GENERATOR_PLATFORM MATCHES "ARM64.*") OR ("${CMAKE_C_COMPILER_ARC
 elseif ((CMAKE_GENERATOR_PLATFORM MATCHES "ARM.*") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" MATCHES "ARM.*"))
   set(TAEF_BIN_ARCH "arm")
   set(TAEF_ARCH "arm")
-endif((CMAKE_GENERATOR_PLATFORM STREQUAL "x64") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "x64"))
+else ()
+  message(FATAL_ERROR
+    "Unable to determine TAEF architecture - CMAKE_GENERATOR_PLATFORM is "
+    "${CMAKE_GENERATOR_PLATFORM}, CMAKE_C_COMPILER_ARCHITECTURE_ID is "
+    "${CMAKE_C_COMPILER_ARCHITECTURE_ID}.")
+endif()
 
 set (TAEF_ARCH ${TAEF_ARCH} CACHE INTERNAL "arch for taef test")
 find_program(TAEF_EXECUTABLE te.exe PATHS

tools/clang/test/taef_exec/DownloadWarp.cmake

@@ -76,16 +76,15 @@ endif()
 
 set(WARP_DIR ${CMAKE_BINARY_DIR}/nuget/${WARP_PACKAGE})
 
-if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
-    set(WARP_ARCH "x64")
-endif()
-if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "X86")
-    set(WARP_ARCH "win32")
-endif()
 if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ARM64")
     set(WARP_ARCH "arm64")
+elseif ((CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "X86"))
+    set(WARP_ARCH "win32")
+else()
+    set(WARP_ARCH "x64")
 endif()
 
+
 # WARP_DLL is picked up by lit.site.cfg.in so it can be passed as a TAEF runtime
 # parameter by lit.cfg
 set(WARP_DLL ${WARP_DIR}/build/native/bin/${WARP_ARCH}/d3d10warp.dll)

utils/lit/lit/formats/taef.py

@@ -125,10 +125,14 @@ def execute(self, test, litConfig):
         if self.select_filter != "":
             select_filter = str.format("{} AND {}", select_filter, self.select_filter)
 
-        cmd = [self.te, test_dll, '/inproc',
-                '/select:', select_filter,
-                '/unicodeOutput:false',
-                str.format('/outputFolder:{}', self.test_path)]
+        cmd = [
+            self.te,
+            test_dll,
+            "/select:",
+            select_filter,
+            "/unicodeOutput:false",
+            str.format("/outputFolder:{}", self.test_path),
+        ]
         cmd.extend(self.extra_params)
 
         if litConfig.useValgrind: