diff --git a/src/test/assembly/nvptx-arch-default.rs b/src/test/assembly/nvptx-arch-default.rs index 8a71a6370f112..7fe71c33521a2 100644 --- a/src/test/assembly/nvptx-arch-default.rs +++ b/src/test/assembly/nvptx-arch-default.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type cdylib // only-nvptx64 -// ignore-nvptx64 #![no_std] diff --git a/src/test/assembly/nvptx-arch-emit-asm.rs b/src/test/assembly/nvptx-arch-emit-asm.rs index b252b450fa77d..0ca17729c0212 100644 --- a/src/test/assembly/nvptx-arch-emit-asm.rs +++ b/src/test/assembly/nvptx-arch-emit-asm.rs @@ -1,7 +1,6 @@ // assembly-output: emit-asm // compile-flags: --crate-type rlib // only-nvptx64 -// ignore-nvptx64 #![no_std] diff --git a/src/test/assembly/nvptx-arch-link-arg.rs b/src/test/assembly/nvptx-arch-link-arg.rs index 025a9ad498778..f6b6e8ccaa127 100644 --- a/src/test/assembly/nvptx-arch-link-arg.rs +++ b/src/test/assembly/nvptx-arch-link-arg.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type cdylib -C link-arg=--arch=sm_60 // only-nvptx64 -// ignore-nvptx64 #![no_std] diff --git a/src/test/assembly/nvptx-arch-target-cpu.rs b/src/test/assembly/nvptx-arch-target-cpu.rs index 824ee9cd89732..08a7a193bbd88 100644 --- a/src/test/assembly/nvptx-arch-target-cpu.rs +++ b/src/test/assembly/nvptx-arch-target-cpu.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type cdylib -C target-cpu=sm_50 // only-nvptx64 -// ignore-nvptx64 #![no_std] diff --git a/src/test/assembly/nvptx-atomics.rs b/src/test/assembly/nvptx-atomics.rs index f963980644928..774b10e3d1441 100644 --- a/src/test/assembly/nvptx-atomics.rs +++ b/src/test/assembly/nvptx-atomics.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type cdylib // only-nvptx64 -// ignore-nvptx64 #![feature(abi_ptx, core_intrinsics)] #![no_std] @@ -23,7 +22,7 @@ extern crate breakpoint_panic_handler; // FIXME(denzp): add tests for `core::sync::atomic::*`. #[no_mangle] -pub unsafe extern "ptx-kernel" fn atomics_kernel(a: *mut u32) { +pub unsafe extern "ptx-kernel" fn atomics_kernel(a: *mut u32, out: *mut u32) { // CHECK: atom.global.and.b32 %{{r[0-9]+}}, [%{{rd[0-9]+}}], 1; // CHECK: atom.global.and.b32 %{{r[0-9]+}}, [%{{rd[0-9]+}}], 1; atomic_and(a, 1); @@ -66,8 +65,8 @@ pub unsafe extern "ptx-kernel" fn atomics_kernel(a: *mut u32) { // CHECK: atom.global.exch.b32 %{{r[0-9]+}}, [%{{rd[0-9]+}}], 1; // CHECK: atom.global.exch.b32 %{{r[0-9]+}}, [%{{rd[0-9]+}}], 1; - atomic_xchg(a, 1); - atomic_xchg_relaxed(a, 1); + *out = atomic_xchg(a, 1); + *out = atomic_xchg_relaxed(a, 1); // CHECK: atom.global.xor.b32 %{{r[0-9]+}}, [%{{rd[0-9]+}}], 1; // CHECK: atom.global.xor.b32 %{{r[0-9]+}}, [%{{rd[0-9]+}}], 1; diff --git a/src/test/assembly/nvptx-internalizing.rs b/src/test/assembly/nvptx-internalizing.rs index 0004fcea7a20b..c9edc386959f8 100644 --- a/src/test/assembly/nvptx-internalizing.rs +++ b/src/test/assembly/nvptx-internalizing.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type cdylib // only-nvptx64 -// ignore-nvptx64 #![feature(abi_ptx)] #![no_std] diff --git a/src/test/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs b/src/test/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs index 5bf44f949fdf6..0ceea87b618b4 100644 --- a/src/test/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs +++ b/src/test/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type cdylib -C target-cpu=sm_86 // only-nvptx64 -// ignore-nvptx64 // The following ABI tests are made with nvcc 11.6 does. // diff --git a/src/test/assembly/nvptx-linking-binary.rs b/src/test/assembly/nvptx-linking-binary.rs index 64b9c2f17aa7d..d88ed9139ca6a 100644 --- a/src/test/assembly/nvptx-linking-binary.rs +++ b/src/test/assembly/nvptx-linking-binary.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type bin // only-nvptx64 -// ignore-nvptx64 #![feature(abi_ptx)] #![no_main] diff --git a/src/test/assembly/nvptx-linking-cdylib.rs b/src/test/assembly/nvptx-linking-cdylib.rs index bdbc30ea97fe2..1145f567d8c17 100644 --- a/src/test/assembly/nvptx-linking-cdylib.rs +++ b/src/test/assembly/nvptx-linking-cdylib.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type cdylib // only-nvptx64 -// ignore-nvptx64 #![feature(abi_ptx)] #![no_std] diff --git a/src/test/assembly/nvptx-safe-naming.rs b/src/test/assembly/nvptx-safe-naming.rs index 80bb04fc0f2fb..9b39fc25efe21 100644 --- a/src/test/assembly/nvptx-safe-naming.rs +++ b/src/test/assembly/nvptx-safe-naming.rs @@ -1,7 +1,6 @@ // assembly-output: ptx-linker // compile-flags: --crate-type cdylib // only-nvptx64 -// ignore-nvptx64 #![feature(abi_ptx)] #![no_std] @@ -10,7 +9,7 @@ extern crate breakpoint_panic_handler; // Verify function name doesn't contain unacceaptable characters. -// CHECK: .func (.param .b32 func_retval0) [[IMPL_FN:[a-zA-Z0-9$_]+square[a-zA-Z0-9$_]+]]( +// CHECK: .func (.param .b32 func_retval0) [[IMPL_FN:[a-zA-Z0-9$_]+square[a-zA-Z0-9$_]+]] // CHECK-LABEL: .visible .entry top_kernel( #[no_mangle]