[NFC] Update DXC sources for clang-format (microsoft#5593)

llvm-beanz · web-flow · commit 578114efb9d3 · 2023-08-24T13:55:19.000-05:00
One more batch of NFC changes to get DXC ready to clang-format. This
change disables clang-format of some include blocks and breaks other
include blocks into groups. With this change all of the sources in DXC
can be clang-formatted and will continue to build on all supported
platforms.
diff --git a/include/dxc/DxilContainer/DxilRuntimeReflection.h b/include/dxc/DxilContainer/DxilRuntimeReflection.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include "dxc/DXIL/DxilConstants.h"
-#include "dxc/WinAdapter.h"
+#include "dxc/Support/WinIncludes.h"
 
 #define RDAT_NULL_REF ((uint32_t)0xFFFFFFFF)
 
diff --git a/include/dxc/Support/HLSLOptions.h b/include/dxc/Support/HLSLOptions.h
@@ -17,10 +17,14 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Option/ArgList.h"
-#include "dxc/dxcapi.h"
 #include "dxc/Support/HLSLVersion.h"
 #include "dxc/Support/SPIRVOptions.h"
 #include "dxc/Support/DxcOptToggles.h"
+
+#include "dxc/Support/WinIncludes.h"
+
+#include "dxc/dxcapi.h"
+
 #include <map>
 #include <set>
 
diff --git a/include/dxc/Test/DxcTestUtils.h b/include/dxc/Test/DxcTestUtils.h
@@ -11,15 +11,19 @@
 
 #pragma once
 
-#include <string>
-#include <vector>
-#include <map>
+
+#include "dxc/Support/WinIncludes.h"
+
 #include "dxc/dxcapi.h"
 #include "dxc/Support/dxcapi.use.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringMap.h"
 
+#include <string>
+#include <vector>
+#include <map>
+
 namespace hlsl {
 namespace options {
 class DxcOpts;
diff --git a/lib/DxcSupport/HLSLOptions.cpp b/lib/DxcSupport/HLSLOptions.cpp
@@ -8,6 +8,10 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "dxc/Support/WinIncludes.h"
+
+#include "dxc/Support/dxcapi.use.h"
+
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Option/OptTable.h"
 #include "llvm/Option/Option.h"
@@ -16,10 +20,8 @@
 #include "llvm/ADT/APInt.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "dxc/Support/Global.h"
-#include "dxc/Support/WinIncludes.h"
 #include "dxc/Support/HLSLOptions.h"
 #include "dxc/Support/Unicode.h"
-#include "dxc/Support/dxcapi.use.h"
 #include "dxc/DXIL/DxilShaderModel.h"
 
 using namespace llvm::opt;
diff --git a/lib/DxcSupport/dxcapi.use.cpp b/lib/DxcSupport/dxcapi.use.cpp
@@ -10,7 +10,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "dxc/Support/WinIncludes.h"
+
 #include "dxc/Support/dxcapi.use.h"
+
 #include "dxc/Support/Global.h"
 #include "dxc/Support/Unicode.h"
 #include "dxc/Support/FileIOHelper.h"
diff --git a/projects/dxilconv/include/DxbcConverter.h b/projects/dxilconv/include/DxbcConverter.h
@@ -12,6 +12,8 @@
 #ifndef __DXBC_CONVERTER__H__
 #define __DXBC_CONVERTER__H__
 
+#include "dxc/dxcapi.h"
+
 #ifndef _MSC_VER
 extern "C"
 #endif
diff --git a/projects/dxilconv/include/DxilConvPasses/ScopeNest.h b/projects/dxilconv/include/DxilConvPasses/ScopeNest.h
@@ -38,6 +38,8 @@
 
 #pragma once
 
+#include "llvm/Pass.h"
+
 namespace llvm {
 
 struct ScopeNestEvent {
diff --git a/projects/dxilconv/lib/DxbcConverter/DxbcConverter.cpp b/projects/dxilconv/lib/DxbcConverter/DxbcConverter.cpp
@@ -9,7 +9,8 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "llvm/Support/Debug.h"
+#include "llvm/Support/Debug.h" // Must be included first.
+
 #include "DxbcConverterImpl.h"
 #include "DxilConvPasses/DxilCleanup.h"
 #include "dxc/DxilContainer/DxilContainer.h"
diff --git a/projects/dxilconv/lib/DxbcConverter/DxbcUtil.h b/projects/dxilconv/lib/DxbcConverter/DxbcUtil.h
@@ -11,6 +11,8 @@
 
 #pragma once
 
+#include "Support/DXIncludes.h"
+
 #include "dxc/DXIL/DxilShaderModel.h"
 #include "dxc/DXIL/DxilSemantic.h"
 #include "dxc/DXIL/DxilInterpolationMode.h"
diff --git a/projects/dxilconv/tools/dxilconv/dxilconv.cpp b/projects/dxilconv/tools/dxilconv/dxilconv.cpp
@@ -12,8 +12,10 @@
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MD5.h"
+
 #include "dxc/Support/WinIncludes.h"
 #include "dxc/Support/Global.h"
+
 #include "Tracing/DxcRuntimeEtw.h"
 
 #define DXC_API_IMPORT
diff --git a/tools/clang/lib/Parse/HLSLRootSignature.h b/tools/clang/lib/Parse/HLSLRootSignature.h
@@ -12,6 +12,7 @@
 
 #include "dxc/DXIL/DXIL.h"
 #include "dxc/DxilRootSignature/DxilRootSignature.h"
+#include "dxc/Support/WinIncludes.h"
 
 namespace llvm {
 class raw_ostream;
diff --git a/tools/clang/tools/dxcompiler/dxcompilerobj.cpp b/tools/clang/tools/dxcompiler/dxcompilerobj.cpp
@@ -12,42 +12,42 @@
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetOptions.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/HLSLMacroExpander.h"
+#include "clang/Basic/TargetOptions.h"
+#include "clang/CodeGen/CodeGenAction.h"
 #include "clang/Frontend/ASTUnit.h"
+#include "clang/Frontend/CompilerInstance.h"
+#include "clang/Frontend/FrontendActions.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
+#include "clang/Lex/HLSLMacroExpander.h"
+#include "clang/Lex/Preprocessor.h"
 #include "clang/Sema/SemaHLSL.h"
 #include "llvm/Bitcode/ReaderWriter.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/CodeGen/CodeGenAction.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/Support/TimeProfiler.h"
-#include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Support/Timer.h"
-#include "dxc/Support/WinIncludes.h"
-#include "dxc/HLSL/HLSLExtensionsCodegenHelper.h"
+#include "llvm/Transforms/Utils/Cloning.h"
+
+#include "dxc/DXIL/DxilModule.h"
+#include "dxc/DXIL/DxilPDB.h"
+#include "dxc/DxcBindingTable/DxcBindingTable.h"
+#include "dxc/DxilContainer/DxilContainerAssembler.h"
 #include "dxc/DxilRootSignature/DxilRootSignature.h"
-#include "dxcutil.h"
-#include "dxc/Support/dxcfilesystem.h"
+#include "dxc/HLSL/HLSLExtensionsCodegenHelper.h"
 #include "dxc/Support/WinIncludes.h"
-#include "dxc/DxilContainer/DxilContainerAssembler.h"
+#include "dxc/Support/dxcfilesystem.h"
 #include "dxc/dxcapi.internal.h"
-#include "dxc/DXIL/DxilPDB.h"
-#include "dxc/DXIL/DxilModule.h"
-#include "dxc/DxcBindingTable/DxcBindingTable.h"
+#include "dxcutil.h"
 
-#include "dxc/Support/dxcapi.use.h"
+#include "dxc/Support/DxcLangExtensionsHelper.h"
+#include "dxc/Support/FileIOHelper.h"
 #include "dxc/Support/Global.h"
+#include "dxc/Support/HLSLOptions.h"
 #include "dxc/Support/Unicode.h"
-#include "dxc/Support/microcom.h"
-#include "dxc/Support/FileIOHelper.h"
 #include "dxc/Support/dxcapi.impl.h"
-#include "dxc/Support/DxcLangExtensionsHelper.h"
-#include "dxc/Support/HLSLOptions.h"
+#include "dxc/Support/dxcapi.use.h"
+#include "dxc/Support/microcom.h"
 
 #ifdef _WIN32
 #include "dxcetw.h"
diff --git a/tools/clang/tools/dxrfallbackcompiler/dxcdxrfallbackcompiler.cpp b/tools/clang/tools/dxrfallbackcompiler/dxcdxrfallbackcompiler.cpp
@@ -9,6 +9,8 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+// clang-format off
+// Includes on Windows are highly order dependent.
 #include "dxc/Support/WinIncludes.h"
 #include "dxc/Support/Global.h"
 #include "dxc/Support/Unicode.h"
@@ -38,6 +40,7 @@
 #include "llvm/IR/LegacyPassManager.h"
 
 #include "dxc/HLSL/DxilFallbackLayerPass.h"
+// clang-format on
 
 using namespace llvm;
 using namespace hlsl;
diff --git a/tools/clang/unittests/HLSL/CompilerTest.cpp b/tools/clang/unittests/HLSL/CompilerTest.cpp
@@ -13,6 +13,8 @@
 #define UNICODE
 #endif
 
+// clang-format off
+// Includes on Windows are highly order dependent.
 #include <memory>
 #include <vector>
 #include <string>
@@ -57,6 +59,7 @@
 #include "llvm/Support/Path.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringSwitch.h"
+// clang-format on
 
 using namespace std;
 using namespace hlsl_test;
diff --git a/tools/clang/unittests/HLSL/MSFileSysTest.cpp b/tools/clang/unittests/HLSL/MSFileSysTest.cpp
@@ -9,8 +9,10 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+// clang-format off
+// Includes on Windows are highly order dependent.
 #include <stdint.h>
-#include <dxc/Support/WinIncludes.h>
+#include "dxc/Support/WinIncludes.h"
 #include "WexTestClass.h"
 #include "dxc/Test/HlslTestUtils.h"
 
@@ -23,6 +25,7 @@
 #include <algorithm>
 #include <vector>
 #include <memory>
+// clang-format on
 
 using namespace llvm;
 using namespace llvm::sys;
diff --git a/tools/clang/unittests/HLSL/RewriterTest.cpp b/tools/clang/unittests/HLSL/RewriterTest.cpp
@@ -20,6 +20,8 @@
 #define NOMINMAX
 #endif
 
+// clang-format off
+// Includes on Windows are highly order dependent.
 #include <memory>
 #include <vector>
 #include <string>
@@ -41,6 +43,7 @@
 #include "dxc/dxctools.h"
 #include "dxc/Support/dxcapi.use.h"
 #include "dxc/dxcapi.internal.h"
+// clang-format on
 
 using namespace std;
 using namespace hlsl_test;
diff --git a/tools/clang/unittests/HLSLErrors/HLSLErrors.cpp b/tools/clang/unittests/HLSLErrors/HLSLErrors.cpp
@@ -1,6 +1,9 @@
+// clang-format off
+// Includes on Windows are highly order dependent.
 #include <atlbase.h>        // Common COM helpers.
 #include "dxc/dxcapi.h"     // Be sure to link with dxcompiler.lib.
 #include <d3d12shader.h>    // Shader reflection.
+// clang-format on
 
 // Code from https://github.com/microsoft/DirectXShaderCompiler/wiki/Using-dxc.exe-and-dxcompiler.dll
 // Included here to verify compilation success. If this needs to be altered, please update the wiki as well
diff --git a/tools/clang/unittests/HLSLExec/ExecutionTest.cpp b/tools/clang/unittests/HLSLExec/ExecutionTest.cpp
@@ -15,6 +15,8 @@
 
 // *** THIS FILE CANNOT TAKE ANY LLVM DEPENDENCIES  *** //
 
+// clang-format off
+// Includes on Windows are highly order dependent.
 #include <algorithm>
 #include <memory>
 #include <array>
@@ -56,6 +58,7 @@
 #include <wincodec.h>
 #include "ShaderOpTest.h"
 #include <libloaderapi.h>
+// clang-format on
 
 #pragma comment(lib, "d3dcompiler.lib")
 #pragma comment(lib, "windowscodecs.lib")
diff --git a/tools/clang/unittests/HLSLTestLib/FileCheckForTest.cpp b/tools/clang/unittests/HLSLTestLib/FileCheckForTest.cpp
@@ -36,7 +36,7 @@
 #include <vector>
 
 // HLSL Change
-#include <dxc/Support/WinIncludes.h>
+#include "dxc/Support/WinIncludes.h"
 #include "llvm/Support/MSFileSystem.h"
 #include "dxc/Test/DxcTestUtils.h"
 // End HLSL Change
