Skip to content

Commit ca30a4b

Browse files
authored
Merge pull request #2201 from folkertdev/rustdocflags
fix CI after LLVM bump
2 parents 50afa9f + 95239b2 commit ca30a4b

12 files changed

Lines changed: 281 additions & 86 deletions

File tree

ci/dox.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dox() {
2222
export CARGO_UNSTABLE_BUILD_STD=core
2323
# amdgpu needs a target-cpu, any is fine
2424
export RUSTFLAGS="${RUSTFLAGS} -Ctarget-cpu=gfx900"
25+
export RUSTDOCFLAGS="${RUSTDOCFLAGS} -Ctarget-cpu=gfx900"
2526
fi
2627

2728
cargo build --verbose --target "${1}" --manifest-path crates/core_arch/Cargo.toml

ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ cargo_test() {
8282
else
8383
dir="debug"
8484
fi
85-
export CARGO_TARGET_WASM32_WASIP1_RUNNER="wasmtime -Wexceptions --dir /checkout/target/wasm32-wasip1/$dir/deps::."
85+
export CARGO_TARGET_WASM32_WASIP1_RUNNER="wasmtime -Wexceptions --dir /checkout/target/wasm32-wasip1/$dir/build::."
8686
cmd="$cmd --nocapture"
8787
;;
8888
esac

crates/core_arch/src/aarch64/sve/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl<T> SveInto<T> for T {
3939
macro_rules! impl_sve_type {
4040
($(($v:vis, $elem_type:ty, $name:ident, $elt:literal))*) => ($(
4141
#[doc = concat!("Scalable vector of type ", stringify!($elem_type))]
42-
#[derive(Clone, Copy, Debug)]
42+
#[derive(Clone, Copy)]
4343
#[rustc_scalable_vector($elt)]
4444
#[unstable(feature = "stdarch_aarch64_sve", issue = "145052")]
4545
$v struct $name($elem_type);
@@ -52,21 +52,21 @@ macro_rules! impl_sve_tuple_type {
5252
)*);
5353
(@ ($v:vis, $vec_type:ty, 2, $name:ident)) => (
5454
#[doc = concat!("Two-element tuple of scalable vectors of type ", stringify!($vec_type))]
55-
#[derive(Clone, Copy, Debug)]
55+
#[derive(Clone, Copy)]
5656
#[rustc_scalable_vector]
5757
#[unstable(feature = "stdarch_aarch64_sve", issue = "145052")]
5858
$v struct $name($vec_type, $vec_type);
5959
);
6060
(@ ($v:vis, $vec_type:ty, 3, $name:ident)) => (
6161
#[doc = concat!("Three-element tuple of scalable vectors of type ", stringify!($vec_type))]
62-
#[derive(Clone, Copy, Debug)]
62+
#[derive(Clone, Copy)]
6363
#[rustc_scalable_vector]
6464
#[unstable(feature = "stdarch_aarch64_sve", issue = "145052")]
6565
$v struct $name($vec_type, $vec_type, $vec_type);
6666
);
6767
(@ ($v:vis, $vec_type:ty, 4, $name:ident)) => (
6868
#[doc = concat!("Four-element tuple of scalable vectors of type ", stringify!($vec_type))]
69-
#[derive(Clone, Copy, Debug)]
69+
#[derive(Clone, Copy)]
7070
#[rustc_scalable_vector]
7171
#[unstable(feature = "stdarch_aarch64_sve", issue = "145052")]
7272
$v struct $name($vec_type, $vec_type, $vec_type, $vec_type);

crates/core_arch/src/amdgpu/mod.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,15 +351,16 @@ pub unsafe fn sched_barrier<const MASK: u32>() {
351351
/// Combining multiple `sched_group_barrier` intrinsics enables an ordering of specific instruction types during instruction scheduling.
352352
/// For example, the following enforces a sequence of 1 VMEM read, followed by 1 VALU instruction, followed by 5 MFMA instructions.
353353
///
354-
/// ```rust
354+
/// ```ignore
355355
/// // 1 VMEM read
356-
/// sched_group_barrier::<32, 1, 0>()
356+
/// sched_group_barrier::<32, 1, 0>();
357357
/// // 1 VALU
358-
/// sched_group_barrier::<2, 1, 0>()
358+
/// sched_group_barrier::<2, 1, 0>();
359359
/// // 5 MFMA
360-
/// sched_group_barrier::<8, 5, 0>()
360+
/// sched_group_barrier::<8, 5, 0>();
361361
/// ```
362362
///
363+
#[doc(cfg(target_arch = "amdgpu"))]
363364
#[doc = include_str!("intrinsic_is_convergent.md")]
364365
#[inline]
365366
#[unstable(feature = "stdarch_amdgpu", issue = "149988")]

0 commit comments

Comments
 (0)