Skip to content

[Clang] Fix SPIR-V Windows targets for cdecl-as-default CC #22942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenju-he merged 4 commits into from
Aug 17, 2026
Merged

[Clang] Fix SPIR-V Windows targets for cdecl-as-default CC #22942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77b45e1
[Basic] Fix SPIR-V Windows target classes for cdecl-as-default CC
wenju-he Aug 14, 2026
bc962b1
partial revert "[Basic] Fix SPIR-V Windows target classes for cdecl-a…
wenju-he Aug 15, 2026
b0c693c
remove -triple spirv32 x86_64-pc-windows-msvc RUN line
wenju-he Aug 15, 2026
447b38f
Accept CC_C in Windows SPIR (non-SPIR-V) target checkCallingConvention
wenju-he Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions clang/lib/Basic/Targets/SPIR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,9 @@ class LLVM_LIBRARY_VISIBILITY WindowsX86_32SPIRTargetInfo
if (CC == CC_X86VectorCall)
// Permit CC_X86VectorCall which is used in Microsoft headers
return CCCR_OK;
return (CC == CC_SpirFunction || CC == CC_DeviceKernel) ? CCCR_OK
: CCCR_Warning;
return (CC == CC_C || CC == CC_SpirFunction || CC == CC_DeviceKernel)
? CCCR_OK
: CCCR_Warning;
}
};

Expand Down Expand Up @@ -383,8 +384,9 @@ class LLVM_LIBRARY_VISIBILITY WindowsX86_64_SPIR64TargetInfo
// Permit CC_X86RegCall which is used to mark external functions with
// explicit simd or structure type arguments to pass them via registers.
return CCCR_OK;
return (CC == CC_SpirFunction || CC == CC_DeviceKernel) ? CCCR_OK
: CCCR_Warning;
return (CC == CC_C || CC == CC_SpirFunction || CC == CC_DeviceKernel)
? CCCR_OK
: CCCR_Warning;
}

bool
Expand Down Expand Up @@ -432,8 +434,9 @@ class LLVM_LIBRARY_VISIBILITY WindowsARM64_SPIR64TargetInfo
}

CallingConvCheckResult checkCallingConvention(CallingConv CC) const override {
return (CC == CC_SpirFunction || CC == CC_DeviceKernel) ? CCCR_OK
: CCCR_Warning;
return (CC == CC_C || CC == CC_SpirFunction || CC == CC_DeviceKernel)
? CCCR_OK
: CCCR_Warning;
}
};

Expand Down Expand Up @@ -616,8 +619,9 @@ class LLVM_LIBRARY_VISIBILITY WindowsX86_32SPIRV32TargetInfo
if (CC == CC_X86VectorCall)
// Permit CC_X86VectorCall which is used in Microsoft headers
return CCCR_OK;
return (CC == CC_SpirFunction || CC == CC_DeviceKernel) ? CCCR_OK
: CCCR_Warning;
return (CC == CC_C || CC == CC_SpirFunction || CC == CC_DeviceKernel)
? CCCR_OK
: CCCR_Warning;
}
};

Expand Down Expand Up @@ -666,8 +670,9 @@ class LLVM_LIBRARY_VISIBILITY WindowsX86_64_SPIRV64TargetInfo
// Permit CC_X86RegCall which is used to mark external functions with
// explicit simd or structure type arguments to pass them via registers.
return CCCR_OK;
return (CC == CC_SpirFunction || CC == CC_DeviceKernel) ? CCCR_OK
: CCCR_Warning;
return (CC == CC_C || CC == CC_SpirFunction || CC == CC_DeviceKernel)
? CCCR_OK
: CCCR_Warning;
}
};

Expand Down
1 change: 0 additions & 1 deletion clang/test/SemaHIP/amdgcnspirv-host-cconv-in-abstract-type.hip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// RUN: %clang_cc1 %s -fcuda-is-device -std=c++17 -triple spirv32 -aux-triple x86_64-pc-windows-msvc -fms-extensions -verify
// RUN: %clang_cc1 %s -fcuda-is-device -std=c++17 -triple spirv64 -aux-triple x86_64-pc-windows-msvc -fms-extensions -verify
// RUN: %clang_cc1 %s -fcuda-is-device -std=c++17 -triple spirv64-amd-amdhsa -aux-triple x86_64-pc-windows-msvc -fms-extensions -verify

Expand Down