[AUTO-GENERATED] Migrate ui tests from `//` to `//@` directives

64 files changed, 174 insertions, 174 deletions

diff --git a/tests/ui/asm/aarch64/bad-options.rs b/tests/ui/asm/aarch64/bad-options.rs
index 6172027a2fa..33b77367a4f 100644
--- a/tests/ui/asm/aarch64/bad-options.rs
+++ b/tests/ui/asm/aarch64/bad-options.rs
@@ -1,4 +1,4 @@
-// only-aarch64
+//@ only-aarch64
 
 use std::arch::{asm, global_asm};
 
diff --git a/tests/ui/asm/aarch64/bad-reg.rs b/tests/ui/asm/aarch64/bad-reg.rs
index f71418161f2..1e54b6505db 100644
--- a/tests/ui/asm/aarch64/bad-reg.rs
+++ b/tests/ui/asm/aarch64/bad-reg.rs
@@ -1,5 +1,5 @@
-// only-aarch64
-// compile-flags: -C target-feature=+neon
+//@ only-aarch64
+//@ compile-flags: -C target-feature=+neon
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/aarch64/const.rs b/tests/ui/asm/aarch64/const.rs
index 0b02c99abf6..a1fadb2115b 100644
--- a/tests/ui/asm/aarch64/const.rs
+++ b/tests/ui/asm/aarch64/const.rs
@@ -1,6 +1,6 @@
-// only-aarch64
-// run-pass
-// needs-asm-support
+//@ only-aarch64
+//@ run-pass
+//@ needs-asm-support
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/aarch64/duplicate-options.fixed b/tests/ui/asm/aarch64/duplicate-options.fixed
index fa1dd4aef5d..b221c7c78bc 100644
--- a/tests/ui/asm/aarch64/duplicate-options.fixed
+++ b/tests/ui/asm/aarch64/duplicate-options.fixed
@@ -1,6 +1,6 @@
-// only-aarch64
-// needs-asm-support
-// run-rustfix
+//@ only-aarch64
+//@ needs-asm-support
+//@ run-rustfix
 
 use std::arch::asm;
 
diff --git a/tests/ui/asm/aarch64/duplicate-options.rs b/tests/ui/asm/aarch64/duplicate-options.rs
index b2d3fe7d9a7..44a45187d2d 100644
--- a/tests/ui/asm/aarch64/duplicate-options.rs
+++ b/tests/ui/asm/aarch64/duplicate-options.rs
@@ -1,6 +1,6 @@
-// only-aarch64
-// needs-asm-support
-// run-rustfix
+//@ only-aarch64
+//@ needs-asm-support
+//@ run-rustfix
 
 use std::arch::asm;
 
diff --git a/tests/ui/asm/aarch64/interpolated-idents.rs b/tests/ui/asm/aarch64/interpolated-idents.rs
index e87a8843499..3d9cf763e4d 100644
--- a/tests/ui/asm/aarch64/interpolated-idents.rs
+++ b/tests/ui/asm/aarch64/interpolated-idents.rs
@@ -1,5 +1,5 @@
-// only-aarch64
-// needs-asm-support
+//@ only-aarch64
+//@ needs-asm-support
 use std::arch::asm;
 
 macro_rules! m {
diff --git a/tests/ui/asm/aarch64/llvm-58384.rs b/tests/ui/asm/aarch64/llvm-58384.rs
index 308f7890829..b11b2f3c0b9 100644
--- a/tests/ui/asm/aarch64/llvm-58384.rs
+++ b/tests/ui/asm/aarch64/llvm-58384.rs
@@ -1,6 +1,6 @@
-// only-aarch64
-// run-pass
-// needs-asm-support
+//@ only-aarch64
+//@ run-pass
+//@ needs-asm-support
 
 // Test that we properly work around this LLVM issue:
 // https://github.com/llvm/llvm-project/issues/58384
diff --git a/tests/ui/asm/aarch64/may_unwind.rs b/tests/ui/asm/aarch64/may_unwind.rs
index cfb75078264..a483008c364 100644
--- a/tests/ui/asm/aarch64/may_unwind.rs
+++ b/tests/ui/asm/aarch64/may_unwind.rs
@@ -1,7 +1,7 @@
-// only-aarch64
-// run-pass
-// needs-asm-support
-// needs-unwind
+//@ only-aarch64
+//@ run-pass
+//@ needs-asm-support
+//@ needs-unwind
 
 #![feature(asm_unwind)]
 
diff --git a/tests/ui/asm/aarch64/parse-error.rs b/tests/ui/asm/aarch64/parse-error.rs
index 9b8170840bb..fbb1e08df91 100644
--- a/tests/ui/asm/aarch64/parse-error.rs
+++ b/tests/ui/asm/aarch64/parse-error.rs
@@ -1,4 +1,4 @@
-// only-aarch64
+//@ only-aarch64
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/aarch64/srcloc.rs b/tests/ui/asm/aarch64/srcloc.rs
index dbb6cbb9437..c635fa6ba70 100644
--- a/tests/ui/asm/aarch64/srcloc.rs
+++ b/tests/ui/asm/aarch64/srcloc.rs
@@ -1,7 +1,7 @@
-// only-aarch64
-// build-fail
-// needs-asm-support
-// compile-flags: -Ccodegen-units=1
+//@ only-aarch64
+//@ build-fail
+//@ needs-asm-support
+//@ compile-flags: -Ccodegen-units=1
 
 use std::arch::asm;
 
diff --git a/tests/ui/asm/aarch64/sym.rs b/tests/ui/asm/aarch64/sym.rs
index 6a6cdb00d51..87c6d5ddfdc 100644
--- a/tests/ui/asm/aarch64/sym.rs
+++ b/tests/ui/asm/aarch64/sym.rs
@@ -1,7 +1,7 @@
-// only-aarch64
-// only-linux
-// needs-asm-support
-// run-pass
+//@ only-aarch64
+//@ only-linux
+//@ needs-asm-support
+//@ run-pass
 
 #![feature(thread_local)]
 
diff --git a/tests/ui/asm/aarch64/type-check-2-2.rs b/tests/ui/asm/aarch64/type-check-2-2.rs
index 89f2b3bb7d0..f442ce81476 100644
--- a/tests/ui/asm/aarch64/type-check-2-2.rs
+++ b/tests/ui/asm/aarch64/type-check-2-2.rs
@@ -1,4 +1,4 @@
-// only-aarch64
+//@ only-aarch64
 
 #![feature(repr_simd, never_type)]
 
diff --git a/tests/ui/asm/aarch64/type-check-2.rs b/tests/ui/asm/aarch64/type-check-2.rs
index 1c71c1185d4..ba68cdd26d9 100644
--- a/tests/ui/asm/aarch64/type-check-2.rs
+++ b/tests/ui/asm/aarch64/type-check-2.rs
@@ -1,4 +1,4 @@
-// only-aarch64
+//@ only-aarch64
 
 #![feature(repr_simd, never_type)]
 
diff --git a/tests/ui/asm/aarch64/type-check-3.rs b/tests/ui/asm/aarch64/type-check-3.rs
index 77524ba7aa5..3fc8e506069 100644
--- a/tests/ui/asm/aarch64/type-check-3.rs
+++ b/tests/ui/asm/aarch64/type-check-3.rs
@@ -1,5 +1,5 @@
-// only-aarch64
-// compile-flags: -C target-feature=+neon
+//@ only-aarch64
+//@ compile-flags: -C target-feature=+neon
 
 #![feature(repr_simd, asm_const)]
 
diff --git a/tests/ui/asm/aarch64/type-check-4.rs b/tests/ui/asm/aarch64/type-check-4.rs
index a14010481fc..f00b4d4c46f 100644
--- a/tests/ui/asm/aarch64/type-check-4.rs
+++ b/tests/ui/asm/aarch64/type-check-4.rs
@@ -1,5 +1,5 @@
-// only-aarch64
-// compile-flags: -C target-feature=+neon
+//@ only-aarch64
+//@ compile-flags: -C target-feature=+neon
 
 #![feature(repr_simd, asm_const)]
 
diff --git a/tests/ui/asm/bad-arch.rs b/tests/ui/asm/bad-arch.rs
index 3eeb76f3d00..f84b9944b36 100644
--- a/tests/ui/asm/bad-arch.rs
+++ b/tests/ui/asm/bad-arch.rs
@@ -1,5 +1,5 @@
-// compile-flags: --target sparc-unknown-linux-gnu
-// needs-llvm-components: sparc
+//@ compile-flags: --target sparc-unknown-linux-gnu
+//@ needs-llvm-components: sparc
 
 #![feature(no_core, lang_items, rustc_attrs)]
 #![no_core]
diff --git a/tests/ui/asm/bad-template.rs b/tests/ui/asm/bad-template.rs
index b70da4921c2..41a906e32a4 100644
--- a/tests/ui/asm/bad-template.rs
+++ b/tests/ui/asm/bad-template.rs
@@ -1,10 +1,10 @@
-// revisions: x86_64 aarch64
+//@ revisions: x86_64 aarch64
 
-// [x86_64] compile-flags: --target x86_64-unknown-linux-gnu
-// [aarch64] compile-flags: --target aarch64-unknown-linux-gnu
+//@ [x86_64] compile-flags: --target x86_64-unknown-linux-gnu
+//@ [aarch64] compile-flags: --target aarch64-unknown-linux-gnu
 
-// [x86_64] needs-llvm-components: x86
-// [aarch64] needs-llvm-components: aarch64
+//@ [x86_64] needs-llvm-components: x86
+//@ [aarch64] needs-llvm-components: aarch64
 
 #![feature(no_core, lang_items, rustc_attrs, asm_const)]
 #![no_core]
diff --git a/tests/ui/asm/const-error.rs b/tests/ui/asm/const-error.rs
index 4e14becf74b..f2cead399b6 100644
--- a/tests/ui/asm/const-error.rs
+++ b/tests/ui/asm/const-error.rs
@@ -1,5 +1,5 @@
-// only-x86_64
-// needs-asm-support
+//@ only-x86_64
+//@ needs-asm-support
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/generic-const.rs b/tests/ui/asm/generic-const.rs
index caa9b7dbce6..133d093d200 100644
--- a/tests/ui/asm/generic-const.rs
+++ b/tests/ui/asm/generic-const.rs
@@ -1,5 +1,5 @@
-// needs-asm-support
-// build-pass
+//@ needs-asm-support
+//@ build-pass
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/inline-syntax.rs b/tests/ui/asm/inline-syntax.rs
index a8c6c71b805..6da1b89ed67 100644
--- a/tests/ui/asm/inline-syntax.rs
+++ b/tests/ui/asm/inline-syntax.rs
@@ -1,17 +1,17 @@
-// revisions: x86_64 arm arm_llvm_18
-//[x86_64] compile-flags: --target x86_64-unknown-linux-gnu
-//[x86_64] check-pass
-//[x86_64] needs-llvm-components: x86
-//[arm] compile-flags: --target armv7-unknown-linux-gnueabihf
-//[arm] build-fail
-//[arm] needs-llvm-components: arm
-//[arm] ignore-llvm-version: 18 - 99
+//@ revisions: x86_64 arm arm_llvm_18
+//@[x86_64] compile-flags: --target x86_64-unknown-linux-gnu
+//@[x86_64] check-pass
+//@[x86_64] needs-llvm-components: x86
+//@[arm] compile-flags: --target armv7-unknown-linux-gnueabihf
+//@[arm] build-fail
+//@[arm] needs-llvm-components: arm
+//@[arm] ignore-llvm-version: 18 - 99
 //Newer LLVM produces extra error notes.
-//[arm_llvm_18] compile-flags: --target armv7-unknown-linux-gnueabihf
-//[arm_llvm_18] build-fail
-//[arm_llvm_18] needs-llvm-components: arm
-//[arm_llvm_18] min-llvm-version: 18
-// needs-asm-support
+//@[arm_llvm_18] compile-flags: --target armv7-unknown-linux-gnueabihf
+//@[arm_llvm_18] build-fail
+//@[arm_llvm_18] needs-llvm-components: arm
+//@[arm_llvm_18] min-llvm-version: 18
+//@ needs-asm-support
 
 #![feature(no_core, lang_items, rustc_attrs)]
 #![crate_type = "rlib"]
diff --git a/tests/ui/asm/issue-113788.rs b/tests/ui/asm/issue-113788.rs
index 903b444767f..3b11e253eda 100644
--- a/tests/ui/asm/issue-113788.rs
+++ b/tests/ui/asm/issue-113788.rs
@@ -1,6 +1,6 @@
 // test that "error: arguments for inline assembly must be copyable" doesn't show up in this code
-// needs-asm-support
-// only-x86_64
+//@ needs-asm-support
+//@ only-x86_64
 fn main() {
     let peb: *const PEB; //~ ERROR cannot find type `PEB` in this scope [E0412]
     unsafe { std::arch::asm!("mov {0}, fs:[0x30]", out(reg) peb); }
diff --git a/tests/ui/asm/issue-72570.rs b/tests/ui/asm/issue-72570.rs
index ac589de2303..2b0e3628de5 100644
--- a/tests/ui/asm/issue-72570.rs
+++ b/tests/ui/asm/issue-72570.rs
@@ -1,4 +1,4 @@
-// needs-asm-support
+//@ needs-asm-support
 
 use std::arch::asm;
 
diff --git a/tests/ui/asm/issue-85247.rs b/tests/ui/asm/issue-85247.rs
index e64f5e8af52..b55b1876ac8 100644
--- a/tests/ui/asm/issue-85247.rs
+++ b/tests/ui/asm/issue-85247.rs
@@ -1,10 +1,10 @@
-// revisions: ropi rwpi
+//@ revisions: ropi rwpi
 
-// [ropi] compile-flags: --target armv7-unknown-linux-gnueabihf -C relocation-model=ropi
-// [rwpi] compile-flags: --target armv7-unknown-linux-gnueabihf -C relocation-model=rwpi
-// [ropi] needs-llvm-components: arm
-// [rwpi] needs-llvm-components: arm
-// [ropi] build-pass
+//@ [ropi] compile-flags: --target armv7-unknown-linux-gnueabihf -C relocation-model=ropi
+//@ [rwpi] compile-flags: --target armv7-unknown-linux-gnueabihf -C relocation-model=rwpi
+//@ [ropi] needs-llvm-components: arm
+//@ [rwpi] needs-llvm-components: arm
+//@ [ropi] build-pass
 
 #![feature(no_core, lang_items, rustc_attrs)]
 #![no_core]
diff --git a/tests/ui/asm/issue-87802.rs b/tests/ui/asm/issue-87802.rs
index 5b2e636c29f..d93de9ee57f 100644
--- a/tests/ui/asm/issue-87802.rs
+++ b/tests/ui/asm/issue-87802.rs
@@ -1,7 +1,7 @@
-// needs-asm-support
-// ignore-nvptx64
-// ignore-spirv
-// ignore-wasm32
+//@ needs-asm-support
+//@ ignore-nvptx64
+//@ ignore-spirv
+//@ ignore-wasm32
 // Make sure rustc doesn't ICE on asm! when output type is !.
 
 use std::arch::asm;
diff --git a/tests/ui/asm/issue-89305.rs b/tests/ui/asm/issue-89305.rs
index 05677912dff..84425c4a8f6 100644
--- a/tests/ui/asm/issue-89305.rs
+++ b/tests/ui/asm/issue-89305.rs
@@ -1,8 +1,8 @@
 // Regression test for #89305, where a variable was erroneously reported
 // as both unused and possibly-uninitialized.
 
-// check-pass
-// needs-asm-support
+//@ check-pass
+//@ needs-asm-support
 
 #![warn(unused)]
 
diff --git a/tests/ui/asm/issue-92378.rs b/tests/ui/asm/issue-92378.rs
index 809b0d1555a..3cbdabf8134 100644
--- a/tests/ui/asm/issue-92378.rs
+++ b/tests/ui/asm/issue-92378.rs
@@ -1,7 +1,7 @@
-// compile-flags: --target armv5te-unknown-linux-gnueabi
-// needs-llvm-components: arm
-// needs-asm-support
-// build-pass
+//@ compile-flags: --target armv5te-unknown-linux-gnueabi
+//@ needs-llvm-components: arm
+//@ needs-asm-support
+//@ build-pass
 
 #![feature(no_core, lang_items, rustc_attrs)]
 #![no_core]
diff --git a/tests/ui/asm/issue-97490.rs b/tests/ui/asm/issue-97490.rs
index 37862cf349c..5f364a22bc4 100644
--- a/tests/ui/asm/issue-97490.rs
+++ b/tests/ui/asm/issue-97490.rs
@@ -1,6 +1,6 @@
-// check-pass
-// only-x86_64
-// needs-asm-support
+//@ check-pass
+//@ only-x86_64
+//@ needs-asm-support
 
 pub type Yes = extern "sysv64" fn(&'static u8) -> !;
 
diff --git a/tests/ui/asm/issue-99071.rs b/tests/ui/asm/issue-99071.rs
index bb6201861df..bc3f7815511 100644
--- a/tests/ui/asm/issue-99071.rs
+++ b/tests/ui/asm/issue-99071.rs
@@ -1,6 +1,6 @@
-// compile-flags: --target thumbv6m-none-eabi
-// needs-llvm-components: arm
-// needs-asm-support
+//@ compile-flags: --target thumbv6m-none-eabi
+//@ needs-llvm-components: arm
+//@ needs-asm-support
 
 #![feature(no_core, lang_items, rustc_attrs)]
 #![no_core]
diff --git a/tests/ui/asm/issue-99122-2.rs b/tests/ui/asm/issue-99122-2.rs
index cfb9fd90a55..6ac5f059a62 100644
--- a/tests/ui/asm/issue-99122-2.rs
+++ b/tests/ui/asm/issue-99122-2.rs
@@ -1,6 +1,6 @@
-// check-pass
-// needs-asm-support
-// only-x86_64
+//@ check-pass
+//@ needs-asm-support
+//@ only-x86_64
 
 // This demonstrates why we need to erase regions before sized check in intrinsicck
 
diff --git a/tests/ui/asm/issue-99122.rs b/tests/ui/asm/issue-99122.rs
index 744a563d3d1..e2675dc431d 100644
--- a/tests/ui/asm/issue-99122.rs
+++ b/tests/ui/asm/issue-99122.rs
@@ -1,5 +1,5 @@
-// needs-asm-support
-// only-x86_64
+//@ needs-asm-support
+//@ only-x86_64
 
 pub unsafe fn test() {
     let pointer = 1u32 as *const _;
diff --git a/tests/ui/asm/may_unwind.rs b/tests/ui/asm/may_unwind.rs
index b9479c44bf1..216408b3873 100644
--- a/tests/ui/asm/may_unwind.rs
+++ b/tests/ui/asm/may_unwind.rs
@@ -1,5 +1,5 @@
-// run-pass
-// needs-asm-support
+//@ run-pass
+//@ needs-asm-support
 
 #![feature(asm_unwind)]
 
diff --git a/tests/ui/asm/naked-functions-ffi.rs b/tests/ui/asm/naked-functions-ffi.rs
index c8bee504d02..93d23885b13 100644
--- a/tests/ui/asm/naked-functions-ffi.rs
+++ b/tests/ui/asm/naked-functions-ffi.rs
@@ -1,5 +1,5 @@
-// check-pass
-// needs-asm-support
+//@ check-pass
+//@ needs-asm-support
 #![feature(naked_functions)]
 #![crate_type = "lib"]
 
diff --git a/tests/ui/asm/naked-functions-unused.rs b/tests/ui/asm/naked-functions-unused.rs
index 044a0e5b940..745d30e6a84 100644
--- a/tests/ui/asm/naked-functions-unused.rs
+++ b/tests/ui/asm/naked-functions-unused.rs
@@ -1,7 +1,7 @@
-// revisions: x86_64 aarch64
-// needs-asm-support
-//[x86_64] only-x86_64
-//[aarch64] only-aarch64
+//@ revisions: x86_64 aarch64
+//@ needs-asm-support
+//@[x86_64] only-x86_64
+//@[aarch64] only-aarch64
 #![deny(unused)]
 #![feature(naked_functions)]
 #![crate_type = "lib"]
diff --git a/tests/ui/asm/naked-functions.rs b/tests/ui/asm/naked-functions.rs
index b18d01730f2..41d6393996d 100644
--- a/tests/ui/asm/naked-functions.rs
+++ b/tests/ui/asm/naked-functions.rs
@@ -1,7 +1,7 @@
-// needs-asm-support
-// ignore-nvptx64
-// ignore-spirv
-// ignore-wasm32
+//@ needs-asm-support
+//@ ignore-nvptx64
+//@ ignore-spirv
+//@ ignore-wasm32
 
 #![feature(naked_functions)]
 #![feature(asm_const, asm_unwind)]
diff --git a/tests/ui/asm/naked-invalid-attr.rs b/tests/ui/asm/naked-invalid-attr.rs
index ea8f560ff5d..57edd57de99 100644
--- a/tests/ui/asm/naked-invalid-attr.rs
+++ b/tests/ui/asm/naked-invalid-attr.rs
@@ -1,6 +1,6 @@
 // Checks that #[naked] attribute can be placed on function definitions only.
 //
-// needs-asm-support
+//@ needs-asm-support
 #![feature(naked_functions)]
 #![naked] //~ ERROR should be applied to a function definition
 
diff --git a/tests/ui/asm/named-asm-labels.rs b/tests/ui/asm/named-asm-labels.rs
index 24586b39aac..2e21d56e323 100644
--- a/tests/ui/asm/named-asm-labels.rs
+++ b/tests/ui/asm/named-asm-labels.rs
@@ -1,7 +1,7 @@
-// needs-asm-support
-// ignore-nvptx64
-// ignore-spirv
-// ignore-wasm32
+//@ needs-asm-support
+//@ ignore-nvptx64
+//@ ignore-spirv
+//@ ignore-wasm32
 
 // Tests that the use of named labels in the `asm!` macro are linted against
 // except for in `#[naked]` fns.
diff --git a/tests/ui/asm/noreturn.rs b/tests/ui/asm/noreturn.rs
index 03fa087ae37..c99715e9f80 100644
--- a/tests/ui/asm/noreturn.rs
+++ b/tests/ui/asm/noreturn.rs
@@ -1,5 +1,5 @@
-// needs-asm-support
-// check-pass
+//@ needs-asm-support
+//@ check-pass
 
 #![feature(never_type)]
 #![crate_type = "rlib"]
diff --git a/tests/ui/asm/parse-error.rs b/tests/ui/asm/parse-error.rs
index 9e002b1550f..6f32293511b 100644
--- a/tests/ui/asm/parse-error.rs
+++ b/tests/ui/asm/parse-error.rs
@@ -1,4 +1,4 @@
-// needs-asm-support
+//@ needs-asm-support
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/reg-conflict.rs b/tests/ui/asm/reg-conflict.rs
index 983788a93cc..bdde12af6df 100644
--- a/tests/ui/asm/reg-conflict.rs
+++ b/tests/ui/asm/reg-conflict.rs
@@ -1,5 +1,5 @@
-// compile-flags: --target armv7-unknown-linux-gnueabihf
-// needs-llvm-components: arm
+//@ compile-flags: --target armv7-unknown-linux-gnueabihf
+//@ needs-llvm-components: arm
 
 #![feature(no_core, lang_items, rustc_attrs)]
 #![no_core]
diff --git a/tests/ui/asm/type-check-1.rs b/tests/ui/asm/type-check-1.rs
index 59f7b36afcd..b18c487fc4b 100644
--- a/tests/ui/asm/type-check-1.rs
+++ b/tests/ui/asm/type-check-1.rs
@@ -1,7 +1,7 @@
-// needs-asm-support
-// ignore-nvptx64
-// ignore-spirv
-// ignore-wasm32
+//@ needs-asm-support
+//@ ignore-nvptx64
+//@ ignore-spirv
+//@ ignore-wasm32
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/type-check-4.rs b/tests/ui/asm/type-check-4.rs
index 666d2c67783..0529811d3ba 100644
--- a/tests/ui/asm/type-check-4.rs
+++ b/tests/ui/asm/type-check-4.rs
@@ -1,7 +1,7 @@
-// needs-asm-support
-// ignore-nvptx64
-// ignore-spirv
-// ignore-wasm32
+//@ needs-asm-support
+//@ ignore-nvptx64
+//@ ignore-spirv
+//@ ignore-wasm32
 
 use std::arch::asm;
 
diff --git a/tests/ui/asm/unpretty-expanded.rs b/tests/ui/asm/unpretty-expanded.rs
index 25cf1c3d730..1da2c7704f4 100644
--- a/tests/ui/asm/unpretty-expanded.rs
+++ b/tests/ui/asm/unpretty-expanded.rs
@@ -1,4 +1,4 @@
-// needs-asm-support
-// check-pass
-// compile-flags: -Zunpretty=expanded
+//@ needs-asm-support
+//@ check-pass
+//@ compile-flags: -Zunpretty=expanded
 core::arch::global_asm!("x: .byte 42");
diff --git a/tests/ui/asm/unpretty-expanded.stdout b/tests/ui/asm/unpretty-expanded.stdout
index ab1b5f45e5c..80ccd127d50 100644
--- a/tests/ui/asm/unpretty-expanded.stdout
+++ b/tests/ui/asm/unpretty-expanded.stdout
@@ -4,7 +4,7 @@
 use ::std::prelude::rust_2015::*;
 #[macro_use]
 extern crate std;
-// needs-asm-support
-// check-pass
-// compile-flags: -Zunpretty=expanded
+//@ needs-asm-support
+//@ check-pass
+//@ compile-flags: -Zunpretty=expanded
 global_asm! ("x: .byte 42");
diff --git a/tests/ui/asm/x86_64/bad-clobber-abi.rs b/tests/ui/asm/x86_64/bad-clobber-abi.rs
index ddcd2065bfe..5205a084162 100644
--- a/tests/ui/asm/x86_64/bad-clobber-abi.rs
+++ b/tests/ui/asm/x86_64/bad-clobber-abi.rs
@@ -1,5 +1,5 @@
-// needs-asm-support
-// only-x86_64
+//@ needs-asm-support
+//@ only-x86_64
 
 use std::arch::asm;
 
diff --git a/tests/ui/asm/x86_64/bad-options.rs b/tests/ui/asm/x86_64/bad-options.rs
index f7c2cd6c505..a6d5022ecf1 100644
--- a/tests/ui/asm/x86_64/bad-options.rs
+++ b/tests/ui/asm/x86_64/bad-options.rs
@@ -1,4 +1,4 @@
-// only-x86_64
+//@ only-x86_64
 
 use std::arch::{asm, global_asm};
 
diff --git a/tests/ui/asm/x86_64/bad-reg.rs b/tests/ui/asm/x86_64/bad-reg.rs
index e19221bc04e..d41c46d57bb 100644
--- a/tests/ui/asm/x86_64/bad-reg.rs
+++ b/tests/ui/asm/x86_64/bad-reg.rs
@@ -1,5 +1,5 @@
-// only-x86_64
-// compile-flags: -C target-feature=+avx2
+//@ only-x86_64
+//@ compile-flags: -C target-feature=+avx2
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/x86_64/const.rs b/tests/ui/asm/x86_64/const.rs
index f9a2ab6269f..817a338a5b9 100644
--- a/tests/ui/asm/x86_64/const.rs
+++ b/tests/ui/asm/x86_64/const.rs
@@ -1,6 +1,6 @@
-// only-x86_64
-// run-pass
-// needs-asm-support
+//@ only-x86_64
+//@ run-pass
+//@ needs-asm-support
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/x86_64/duplicate-options.fixed b/tests/ui/asm/x86_64/duplicate-options.fixed
index c5f14f5f75c..38a98a30ece 100644
--- a/tests/ui/asm/x86_64/duplicate-options.fixed
+++ b/tests/ui/asm/x86_64/duplicate-options.fixed
@@ -1,5 +1,5 @@
-// only-x86_64
-// run-rustfix
+//@ only-x86_64
+//@ run-rustfix
 
 use std::arch::{asm, global_asm};
 
diff --git a/tests/ui/asm/x86_64/duplicate-options.rs b/tests/ui/asm/x86_64/duplicate-options.rs
index a8dce1f8d71..1f043b964de 100644
--- a/tests/ui/asm/x86_64/duplicate-options.rs
+++ b/tests/ui/asm/x86_64/duplicate-options.rs
@@ -1,5 +1,5 @@
-// only-x86_64
-// run-rustfix
+//@ only-x86_64
+//@ run-rustfix
 
 use std::arch::{asm, global_asm};
 
diff --git a/tests/ui/asm/x86_64/evex512-implicit-feature.rs b/tests/ui/asm/x86_64/evex512-implicit-feature.rs
index a15060857ec..ea2acd424e2 100644
--- a/tests/ui/asm/x86_64/evex512-implicit-feature.rs
+++ b/tests/ui/asm/x86_64/evex512-implicit-feature.rs
@@ -1,6 +1,6 @@
-// build-pass
-// only-x86_64
-// compile-flags: --crate-type=lib -C target-cpu=skylake
+//@ build-pass
+//@ only-x86_64
+//@ compile-flags: --crate-type=lib -C target-cpu=skylake
 
 #![feature(avx512_target_feature)]
 #![feature(stdarch_x86_avx512)]
diff --git a/tests/ui/asm/x86_64/interpolated-idents.rs b/tests/ui/asm/x86_64/interpolated-idents.rs
index c05633ae885..4f349c5b213 100644
--- a/tests/ui/asm/x86_64/interpolated-idents.rs
+++ b/tests/ui/asm/x86_64/interpolated-idents.rs
@@ -1,4 +1,4 @@
-// only-x86_64
+//@ only-x86_64
 
 use std::arch::asm;
 
diff --git a/tests/ui/asm/x86_64/issue-82869.rs b/tests/ui/asm/x86_64/issue-82869.rs
index 67933666eb5..5d3f417f733 100644
--- a/tests/ui/asm/x86_64/issue-82869.rs
+++ b/tests/ui/asm/x86_64/issue-82869.rs
@@ -1,5 +1,5 @@
-// needs-asm-support
-// only-x86_64
+//@ needs-asm-support
+//@ only-x86_64
 // Make sure rustc doesn't ICE on asm! for a foreign architecture.
 
 #![crate_type = "rlib"]
diff --git a/tests/ui/asm/x86_64/issue-89875.rs b/tests/ui/asm/x86_64/issue-89875.rs
index 39c64564022..af940f05fea 100644
--- a/tests/ui/asm/x86_64/issue-89875.rs
+++ b/tests/ui/asm/x86_64/issue-89875.rs
@@ -1,6 +1,6 @@
-// build-pass
-// needs-asm-support
-// only-x86_64
+//@ build-pass
+//@ needs-asm-support
+//@ only-x86_64
 
 #![feature(target_feature_11)]
 
diff --git a/tests/ui/asm/x86_64/issue-96797.rs b/tests/ui/asm/x86_64/issue-96797.rs
index 6c22c2f6c94..531e16795dd 100644
--- a/tests/ui/asm/x86_64/issue-96797.rs
+++ b/tests/ui/asm/x86_64/issue-96797.rs
@@ -1,8 +1,8 @@
-// build-pass
-// compile-flags: -O
-// needs-asm-support
-// only-x86_64
-// only-linux
+//@ build-pass
+//@ compile-flags: -O
+//@ needs-asm-support
+//@ only-x86_64
+//@ only-linux
 
 // regression test for #96797
 
diff --git a/tests/ui/asm/x86_64/may_unwind.rs b/tests/ui/asm/x86_64/may_unwind.rs
index c11f0938d0b..3b2c1edcd47 100644
--- a/tests/ui/asm/x86_64/may_unwind.rs
+++ b/tests/ui/asm/x86_64/may_unwind.rs
@@ -1,7 +1,7 @@
-// only-x86_64
-// run-pass
-// needs-asm-support
-// needs-unwind
+//@ only-x86_64
+//@ run-pass
+//@ needs-asm-support
+//@ needs-unwind
 
 #![feature(asm_unwind)]
 
diff --git a/tests/ui/asm/x86_64/multiple-clobber-abi.rs b/tests/ui/asm/x86_64/multiple-clobber-abi.rs
index 06589431a44..bf241b9771b 100644
--- a/tests/ui/asm/x86_64/multiple-clobber-abi.rs
+++ b/tests/ui/asm/x86_64/multiple-clobber-abi.rs
@@ -1,6 +1,6 @@
-// run-pass
-// needs-asm-support
-// only-x86_64
+//@ run-pass
+//@ needs-asm-support
+//@ only-x86_64
 
 // Checks that multiple clobber_abi options can be used
 
diff --git a/tests/ui/asm/x86_64/srcloc.rs b/tests/ui/asm/x86_64/srcloc.rs
index 1135ad2e1c6..2938bafe5e7 100644
--- a/tests/ui/asm/x86_64/srcloc.rs
+++ b/tests/ui/asm/x86_64/srcloc.rs
@@ -1,6 +1,6 @@
-// only-x86_64
-// build-fail
-// compile-flags: -Ccodegen-units=1
+//@ only-x86_64
+//@ build-fail
+//@ compile-flags: -Ccodegen-units=1
 
 use std::arch::asm;
 
diff --git a/tests/ui/asm/x86_64/sym.rs b/tests/ui/asm/x86_64/sym.rs
index 93ef4f09062..0a86bd66ccb 100644
--- a/tests/ui/asm/x86_64/sym.rs
+++ b/tests/ui/asm/x86_64/sym.rs
@@ -1,7 +1,7 @@
-// only-x86_64
-// only-linux
-// needs-asm-support
-// run-pass
+//@ only-x86_64
+//@ only-linux
+//@ needs-asm-support
+//@ run-pass
 
 #![feature(thread_local)]
 
diff --git a/tests/ui/asm/x86_64/target-feature-attr.rs b/tests/ui/asm/x86_64/target-feature-attr.rs
index 14490c3e0f2..820be132ef7 100644
--- a/tests/ui/asm/x86_64/target-feature-attr.rs
+++ b/tests/ui/asm/x86_64/target-feature-attr.rs
@@ -1,4 +1,4 @@
-// only-x86_64
+//@ only-x86_64
 
 #![feature(avx512_target_feature)]
 
diff --git a/tests/ui/asm/x86_64/type-check-2.rs b/tests/ui/asm/x86_64/type-check-2.rs
index 80b29ec870f..c866f9fd8cc 100644
--- a/tests/ui/asm/x86_64/type-check-2.rs
+++ b/tests/ui/asm/x86_64/type-check-2.rs
@@ -1,4 +1,4 @@
-// only-x86_64
+//@ only-x86_64
 
 #![feature(repr_simd, never_type)]
 
diff --git a/tests/ui/asm/x86_64/type-check-3.rs b/tests/ui/asm/x86_64/type-check-3.rs
index 89c849c7523..bd242af3dbc 100644
--- a/tests/ui/asm/x86_64/type-check-3.rs
+++ b/tests/ui/asm/x86_64/type-check-3.rs
@@ -1,5 +1,5 @@
-// only-x86_64
-// compile-flags: -C target-feature=+avx512f
+//@ only-x86_64
+//@ compile-flags: -C target-feature=+avx512f
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/x86_64/type-check-4.rs b/tests/ui/asm/x86_64/type-check-4.rs
index d0dacda4afb..f7bf60d04df 100644
--- a/tests/ui/asm/x86_64/type-check-4.rs
+++ b/tests/ui/asm/x86_64/type-check-4.rs
@@ -1,5 +1,5 @@
-// only-x86_64
-// compile-flags: -C target-feature=+avx512f
+//@ only-x86_64
+//@ compile-flags: -C target-feature=+avx512f
 
 #![feature(asm_const)]
 
diff --git a/tests/ui/asm/x86_64/type-check-5.rs b/tests/ui/asm/x86_64/type-check-5.rs
index 1d579ccc90e..b5b51f61168 100644
--- a/tests/ui/asm/x86_64/type-check-5.rs
+++ b/tests/ui/asm/x86_64/type-check-5.rs
@@ -1,4 +1,4 @@
-// only-x86_64
+//@ only-x86_64
 
 #![feature(repr_simd, never_type)]
 
diff --git a/tests/ui/asm/x86_64/x86_64_parse_error.rs b/tests/ui/asm/x86_64/x86_64_parse_error.rs
index 715a67687d1..850033d4ce0 100644
--- a/tests/ui/asm/x86_64/x86_64_parse_error.rs
+++ b/tests/ui/asm/x86_64/x86_64_parse_error.rs
@@ -1,4 +1,4 @@
-// only-x86_64
+//@ only-x86_64
 
 #![feature(asm_const)]