bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #136807 - workingjubilee:merge-gpus-to-get-the-arcradeongeforce, r=bjorn3

Browse source 
compiler: internally merge `PtxKernel` into `GpuKernel`

r? ``@bjorn3`` for review
This commit is contained in:
Jacob Pratt 2025-02-12 20:10:00 -05:00 • committed by GitHub
commit 33c186baf7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_target/src/callconv/mod.rs
View file

@ -542,8 +542,6 @@ pub enum Conv {
Msp430Intr,
PtxKernel,
GpuKernel,
X86Fastcall,
@ -689,7 +687,8 @@ impl<'a, Ty> FnAbi<'a, Ty> {
"sparc" => sparc::compute_abi_info(cx, self),
"sparc64" => sparc64::compute_abi_info(cx, self),
"nvptx64" => {
if cx.target_spec().adjust_abi(abi, self.c_variadic) == ExternAbi::PtxKernel {
let abi = cx.target_spec().adjust_abi(abi, self.c_variadic);
if abi == ExternAbi::PtxKernel || abi == ExternAbi::GpuKernel {
nvptx64::compute_ptx_kernel_abi_info(cx, self)
} else {
nvptx64::compute_abi_info(self)
@ -841,7 +840,6 @@ impl FromStr for Conv {
"CCmseNonSecureCall" => Ok(Conv::CCmseNonSecureCall),
"CCmseNonSecureEntry" => Ok(Conv::CCmseNonSecureEntry),
"Msp430Intr" => Ok(Conv::Msp430Intr),
"PtxKernel" => Ok(Conv::PtxKernel),
"X86Fastcall" => Ok(Conv::X86Fastcall),
"X86Intr" => Ok(Conv::X86Intr),
"X86Stdcall" => Ok(Conv::X86Stdcall),

1
compiler/rustc_target/src/json.rs
View file

@ -105,7 +105,6 @@ impl ToJson for crate::callconv::Conv {
Self::CCmseNonSecureCall => "CCmseNonSecureCall",
Self::CCmseNonSecureEntry => "CCmseNonSecureEntry",
Self::Msp430Intr => "Msp430Intr",
Self::PtxKernel => "PtxKernel",
Self::X86Fastcall => "X86Fastcall",
Self::X86Intr => "X86Intr",
Self::X86Stdcall => "X86Stdcall",