[moz] Remove ETW from the build.

Fixing the ETW dependency is probably doable but it doesn't seem straightforward
with our cross-compilation setup and having a few ETW markers in DXC isn't
hugely important for us so this commit removes them from the build.

To reduce risk of rebase conflicts, the DxcEtw API is stubbed out in
include/dxcetw.h which would have normally been generated as part of the build.

Author: nical

include/dxc/CMakeLists.txt

@@ -18,7 +18,7 @@ configure_file(
 add_subdirectory(DXIL)
 add_subdirectory(DxilContainer)
 add_subdirectory(Support)
-add_subdirectory(Tracing)
+#add_subdirectory(Tracing)
 
 set(DXC_PUBLIC_HEADERS
     ${CMAKE_CURRENT_BINARY_DIR}/config.h

include/dxcetw.h

@@ -0,0 +1,30 @@
+// Stubbed out tracing functions to remove ETW dependency from the build.
+
+#ifndef DXC_ETW_H
+#define DXC_ETW_H
+
+inline void EventRegisterMicrosoft_Windows_DXCompiler_API() {}
+inline void EventUnregisterMicrosoft_Windows_DXCompiler_API() {}
+
+inline void DxcEtw_DXCompilerInitialization_Start() {}
+inline void DxcEtw_DXCompilerInitialization_Stop(HRESULT hr) {}
+
+inline void DxcEtw_DXCompilerShutdown_Start() {}
+inline void DxcEtw_DXCompilerShutdown_Stop(HRESULT hr) {}
+
+inline void DxcEtw_DXCompilerCreateInstance_Start() {}
+inline void DxcEtw_DXCompilerCreateInstance_Stop(HRESULT hr) {}
+
+inline void DxcEtw_DXCompilerDisassemble_Start() {}
+inline void DxcEtw_DXCompilerDisassemble_Stop(HRESULT hr) {}
+
+inline void DxcEtw_DXCompilerPreprocess_Start() {}
+inline void DxcEtw_DXCompilerPreprocess_Stop(HRESULT hr) {}
+
+inline void DxcEtw_DXCompilerCompile_Start() {}
+inline void DxcEtw_DXCompilerCompile_Stop(HRESULT hr) {}
+
+inline void DxcEtw_DxcValidation_Start() {}
+inline void DxcEtw_DxcValidation_Stop(HRESULT hr) {}
+
+#endif

tools/clang/tools/dxcompiler/CMakeLists.txt

@@ -130,7 +130,7 @@ add_clang_library(dxcompiler SHARED ${SOURCES})
 add_dependencies(dxcompiler TablegenHLSLOptions) 
 if (MSVC)
   # No DxcEtw on non-Windows platforms.
-  add_dependencies(dxcompiler DxcEtw)
+  #add_dependencies(dxcompiler DxcEtw)
 endif()
 target_link_libraries(dxcompiler PRIVATE ${LIBRARIES})
 if (ENABLE_SPIRV_CODEGEN)

tools/clang/tools/dxildll/CMakeLists.txt

@@ -61,8 +61,8 @@ target_link_libraries(dxildll PRIVATE
 if (WIN32)
 add_dependencies(dxildll
     ${DXCDependencies}
-    DxcEtw
-    DxcRuntimeEtw
+    #DxcEtw
+    #DxcRuntimeEtw
 )
 else()
 add_dependencies(dxildll