Skip to content

Conversation

@Przemog1
Copy link
Contributor

No description provided.

AnastaZIuk and others added 30 commits November 10, 2022 12:40
…nd link it with delayed DLL loading approach
…o include directories, archive and runtime output needed by dxcompiler target at configure time with respect to configuration
# Conflicts:
#	CMakeLists.txt
karimsayedre and others added 25 commits November 24, 2025 23:14
…alse && "Unsupported builtin type evaluation at compile-time"); which crashes our debug runtime
Added support for long long and unsigned long long compile-time constant evaluation, addressing issue microsoft#7952.
perform tests on new `tools\clang\test\CodeGenSPIRV\spv.constant-folding.template.int64.hlsl` with `llvm-lit.py`, before the fix and after
…ntrinsics3

Added option for disabling HLSL intrinsics
@github-actions
Copy link
Contributor

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:
git-clang-format --diff 60a1c8568b405bbe9f47ab0431f627ef64988cc4 642ff68ab06951030433b2b69b163e43f31cdd2b -- include/dxc/WinEtwAdapter.h include/dxc/Support/Global.h include/dxc/Support/SPIRVOptions.h include/dxc/Support/dxcapi.use.h include/dxc/WinAdapter.h include/llvm/CodeGen/SchedulerRegistry.h lib/DxcSupport/HLSLOptions.cpp lib/DxcSupport/dxcmem.cpp lib/IR/Core.cpp lib/MSSupport/MSFileSystemImpl.cpp projects/dxilconv/tools/dxilconv/dxilconv.cpp tools/clang/include/clang/AST/ASTContext.h tools/clang/include/clang/AST/HlslTypes.h tools/clang/include/clang/Frontend/CompilerInstance.h tools/clang/include/clang/Frontend/FrontendAction.h tools/clang/lib/AST/ASTContext.cpp tools/clang/lib/Frontend/CompilerInstance.cpp tools/clang/lib/Frontend/FrontendAction.cpp tools/clang/lib/Parse/ParseExprCXX.cpp tools/clang/lib/SPIRV/DeclResultIdMapper.cpp tools/clang/lib/SPIRV/SpirvEmitter.cpp tools/clang/lib/Sema/SemaHLSL.cpp tools/clang/tools/dxcompiler/DXCompiler.cpp tools/clang/tools/dxcompiler/dxcapi.cpp tools/clang/tools/dxcompiler/dxcompilerobj.cpp tools/clang/tools/dxcvalidator/dxcvalidator.cpp tools/clang/tools/dxildll/dxildll.cpp tools/clang/tools/dxrfallbackcompiler/DXCompiler.cpp tools/clang/tools/dxrfallbackcompiler/dxcapi.cpp
View the diff from clang-format here.
diff --git a/include/dxc/Support/Global.h b/include/dxc/Support/Global.h
index 0f4bb898e..578e7f010 100644
--- a/include/dxc/Support/Global.h
+++ b/include/dxc/Support/Global.h
@@ -354,7 +354,7 @@ inline void OutputDebugFormatA(const char *pszFormat, ...) {
 #define DXASSERT_ARGS(expr, fmt, ...)                                          \
   do {                                                                         \
     if (!(expr)) {                                                             \
-      fprintf(stderr, fmt __VA_OPT__(, ) __VA_ARGS__);                        \
+      fprintf(stderr, fmt __VA_OPT__(, ) __VA_ARGS__);                         \
       assert(false);                                                           \
     }                                                                          \
   } while (0)
diff --git a/include/dxc/Support/dxcapi.use.h b/include/dxc/Support/dxcapi.use.h
index d7fe9681e..d48c5b62a 100644
--- a/include/dxc/Support/dxcapi.use.h
+++ b/include/dxc/Support/dxcapi.use.h
@@ -74,7 +74,8 @@ class SpecificDllLoader : public DllLoader {
                   // test multiple validators versions.
     if (m_dll == nullptr)
       return HRESULT_FROM_WIN32(GetLastError());
-    m_createFn = reinterpret_cast<DxcCreateInstanceProc>(reinterpret_cast<void *>(GetProcAddress(m_dll, fnName)));
+    m_createFn = reinterpret_cast<DxcCreateInstanceProc>(
+        reinterpret_cast<void *>(GetProcAddress(m_dll, fnName)));
 
     if (m_createFn == nullptr) {
       HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
@@ -106,7 +107,8 @@ class SpecificDllLoader : public DllLoader {
       fnName2[s] = '2';
       fnName2[s + 1] = '\0';
 #ifdef _WIN32
-      m_createFn2 = reinterpret_cast<DxcCreateInstance2Proc>(reinterpret_cast<void *>(GetProcAddress(m_dll, fnName2)));
+      m_createFn2 = reinterpret_cast<DxcCreateInstance2Proc>(
+          reinterpret_cast<void *>(GetProcAddress(m_dll, fnName2)));
 #else
       m_createFn2 = (DxcCreateInstance2Proc)::dlsym(m_dll, fnName2);
 #endif
diff --git a/include/dxc/WinAdapter.h b/include/dxc/WinAdapter.h
index ca04bec2d..97b6d76ca 100644
--- a/include/dxc/WinAdapter.h
+++ b/include/dxc/WinAdapter.h
@@ -198,7 +198,8 @@
 #define OutputDebugStringA(msg) fputs(msg, stderr)
 #define OutputDebugFormatA(...) fprintf(stderr, __VA_ARGS__)
 
-// I have no idea if I don't break something like INSTALL targets, requires CI tests
+// I have no idea if I don't break something like INSTALL targets, requires CI
+// tests
 #include "WinEtwAdapter.h"
 
 #define UInt32Add UIntAdd
diff --git a/include/llvm/CodeGen/SchedulerRegistry.h b/include/llvm/CodeGen/SchedulerRegistry.h
index 69ffc384b..02fd338e9 100644
--- a/include/llvm/CodeGen/SchedulerRegistry.h
+++ b/include/llvm/CodeGen/SchedulerRegistry.h
@@ -42,8 +42,9 @@ public:
   static MachinePassRegistry<FunctionPassCtor> Registry;
 
   RegisterScheduler(const char *N, const char *D, FunctionPassCtor C)
-      : MachinePassRegistryNode(N, D, C)
-  { Registry.Add(this); }
+      : MachinePassRegistryNode(N, D, C) {
+    Registry.Add(this);
+  }
   ~RegisterScheduler() { Registry.Remove(this); }
 
 
diff --git a/lib/MSSupport/MSFileSystemImpl.cpp b/lib/MSSupport/MSFileSystemImpl.cpp
index ca734f7b4..e75019bef 100644
--- a/lib/MSSupport/MSFileSystemImpl.cpp
+++ b/lib/MSSupport/MSFileSystemImpl.cpp
@@ -323,8 +323,7 @@ typedef BOOLEAN(WINAPI *PtrCreateSymbolicLinkW)(
 
 PtrCreateSymbolicLinkW create_symbolic_link_api =
     PtrCreateSymbolicLinkW(reinterpret_cast<void *>(::GetProcAddress(
-        ::GetModuleHandleW(L"Kernel32.dll"),
-                                            "CreateSymbolicLinkW")));
+        ::GetModuleHandleW(L"Kernel32.dll"), "CreateSymbolicLinkW")));
 } // namespace
 #endif
 
diff --git a/tools/clang/lib/SPIRV/SpirvEmitter.cpp b/tools/clang/lib/SPIRV/SpirvEmitter.cpp
index 90961c5ea..924a0efe7 100644
--- a/tools/clang/lib/SPIRV/SpirvEmitter.cpp
+++ b/tools/clang/lib/SPIRV/SpirvEmitter.cpp
@@ -3353,7 +3353,8 @@ SpirvInstruction *SpirvEmitter::processCall(const CallExpr *callExpr) {
           return nullptr;
         }
         if (!canActAsOutParmVar(param)) {
-          emitError("argument for a non SPIR-V intrinsic parameter with vk::ext_reference attribute "
+          emitError("argument for a non SPIR-V intrinsic parameter with "
+                    "vk::ext_reference attribute "
                     "must be a applied to `inout`",
                     arg->getExprLoc());
           return nullptr;
  • Check this box to apply formatting changes to this branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

9 participants