diff options
| author | Michael Goulet <michael@errs.io> | 2022-08-10 09:28:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-10 09:28:19 -0700 |
| commit | eae824d5bb576a5bddd79e0d9a0de8cbcfcbb3f6 (patch) | |
| tree | 57edea61a1baf528c14e4f3d5b65447e2a34c327 | |
| parent | d0d2f60e49d51aa34be648fa7bb102d3f46387ed (diff) | |
| parent | 22930b7b25b12e53be9752e4fb8537c8abf709c8 (diff) | |
| download | rust-eae824d5bb576a5bddd79e0d9a0de8cbcfcbb3f6.tar.gz rust-eae824d5bb576a5bddd79e0d9a0de8cbcfcbb3f6.zip | |
Rollup merge of #100317 - kjetilkjeka:remove-nvptx32-logic, r=eddyb
Remove logic related to deprecated nvptx-nvidia-cuda (32-bit) target As described in the MCP https://github.com/rust-lang/compiler-team/issues/496#issuecomment-1196328748 r? ``@eddyb``
| -rw-r--r-- | compiler/rustc_target/src/abi/call/mod.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_target/src/abi/call/nvptx.rs | 33 |
2 files changed, 0 insertions, 35 deletions
diff --git a/compiler/rustc_target/src/abi/call/mod.rs b/compiler/rustc_target/src/abi/call/mod.rs index 577126a95cc..639ce64a9f5 100644 --- a/compiler/rustc_target/src/abi/call/mod.rs +++ b/compiler/rustc_target/src/abi/call/mod.rs @@ -14,7 +14,6 @@ mod m68k; mod mips; mod mips64; mod msp430; -mod nvptx; mod nvptx64; mod powerpc; mod powerpc64; @@ -702,7 +701,6 @@ impl<'a, Ty> FnAbi<'a, Ty> { "msp430" => msp430::compute_abi_info(self), "sparc" => sparc::compute_abi_info(cx, self), "sparc64" => sparc64::compute_abi_info(cx, self), - "nvptx" => nvptx::compute_abi_info(self), "nvptx64" => { if cx.target_spec().adjust_abi(abi) == spec::abi::Abi::PtxKernel { nvptx64::compute_ptx_kernel_abi_info(cx, self) diff --git a/compiler/rustc_target/src/abi/call/nvptx.rs b/compiler/rustc_target/src/abi/call/nvptx.rs deleted file mode 100644 index 428dd95bbcd..00000000000 --- a/compiler/rustc_target/src/abi/call/nvptx.rs +++ /dev/null @@ -1,33 +0,0 @@ -// Reference: PTX Writer's Guide to Interoperability -// https://docs.nvidia.com/cuda/ptx-writers-guide-to-interoperability - -use crate::abi::call::{ArgAbi, FnAbi}; - -fn classify_ret<Ty>(ret: &mut ArgAbi<'_, Ty>) { - if ret.layout.is_aggregate() && ret.layout.size.bits() > 32 { - ret.make_indirect(); - } else { - ret.extend_integer_width_to(32); - } -} - -fn classify_arg<Ty>(arg: &mut ArgAbi<'_, Ty>) { - if arg.layout.is_aggregate() && arg.layout.size.bits() > 32 { - arg.make_indirect(); - } else { - arg.extend_integer_width_to(32); - } -} - -pub fn compute_abi_info<Ty>(fn_abi: &mut FnAbi<'_, Ty>) { - if !fn_abi.ret.is_ignore() { - classify_ret(&mut fn_abi.ret); - } - - for arg in &mut fn_abi.args { - if arg.is_ignore() { - continue; - } - classify_arg(arg); - } -} |
