i8c-stream-rhel_next
changed/i8c-stream-rhel_next/rust-1.78.0-1.module+el8.10.0+1854+8210e06e
MSVSphere Packaging Team
2 months ago
parent
5ef2559274
commit
da48fdcf5a
GPG Key ID:
B2B0B9F29E528FE8
@ -1,2 +1,2 @@
|
|||||||
SOURCES/rustc-1.77.2-src.tar.xz
|
SOURCES/rustc-1.78.0-src.tar.xz
|
||||||
SOURCES/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz
|
SOURCES/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
5322a4b9998da429eef3a7e07efb5f1f2513b87a SOURCES/rustc-1.77.2-src.tar.xz
|
0e47db96dd07c4632695a9adddcbc077a0500cc3 SOURCES/rustc-1.78.0-src.tar.xz
|
||||||
124d114ffb627ada36bfa1df0216bcea0f55a15e SOURCES/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz
|
124d114ffb627ada36bfa1df0216bcea0f55a15e SOURCES/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz
|
||||||
|
|||||||
@ -0,0 +1,59 @@
|
|||||||
|
From 6dda4e006b0d6d7519ac4a9f540566c81e406a8b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Mon, 22 Apr 2024 16:19:17 -0700
|
||||||
|
Subject: [PATCH] Fix 2 tests for offline execution
|
||||||
|
|
||||||
|
In `alt_registry::warn_for_unused_fields`, the second part of the test
|
||||||
|
runs on `--registry crates-io`, so it needs a local replacement url.
|
||||||
|
|
||||||
|
In `install::install_global_cargo_config`, it was adding to the "config"
|
||||||
|
file, but the `pkg` before it configured the dummy registry replacement
|
||||||
|
in "config.toml". So that replacement wasn't actually used, and if you
|
||||||
|
ran tests online it was trying to install `bar v0.1.1` from the real
|
||||||
|
registry! The filename is now fixed, and the test double-checks that
|
||||||
|
we're only trying to install the local `bar v0.0.1`.
|
||||||
|
---
|
||||||
|
tests/testsuite/alt_registry.rs | 4 ++++
|
||||||
|
tests/testsuite/install.rs | 3 ++-
|
||||||
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs
|
||||||
|
index e95f2cbaabbd..1fef04e3ae42 100644
|
||||||
|
--- a/tests/testsuite/alt_registry.rs
|
||||||
|
+++ b/tests/testsuite/alt_registry.rs
|
||||||
|
@@ -1572,7 +1572,11 @@ or use environment variable CARGO_REGISTRIES_ALTERNATIVE_TOKEN",
|
||||||
|
)
|
||||||
|
.run();
|
||||||
|
|
||||||
|
+ let crates_io = registry::RegistryBuilder::new()
|
||||||
|
+ .no_configure_token()
|
||||||
|
+ .build();
|
||||||
|
p.cargo("publish --registry crates-io")
|
||||||
|
+ .replace_crates_io(crates_io.index_url())
|
||||||
|
.with_status(101)
|
||||||
|
.with_stderr(
|
||||||
|
"\
|
||||||
|
diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs
|
||||||
|
index 89d40ada9543..ef3f4f3ae604 100644
|
||||||
|
--- a/tests/testsuite/install.rs
|
||||||
|
+++ b/tests/testsuite/install.rs
|
||||||
|
@@ -1981,7 +1981,7 @@ fn install_ignores_unstable_table_in_local_cargo_config() {
|
||||||
|
fn install_global_cargo_config() {
|
||||||
|
pkg("bar", "0.0.1");
|
||||||
|
|
||||||
|
- let config = cargo_home().join("config");
|
||||||
|
+ let config = cargo_home().join("config.toml");
|
||||||
|
let mut toml = fs::read_to_string(&config).unwrap_or_default();
|
||||||
|
|
||||||
|
toml.push_str(
|
||||||
|
@@ -1994,6 +1994,7 @@ fn install_global_cargo_config() {
|
||||||
|
|
||||||
|
cargo_process("install bar")
|
||||||
|
.with_status(101)
|
||||||
|
+ .with_stderr_contains("[INSTALLING] bar v0.0.1")
|
||||||
|
.with_stderr_contains("[..]--target nonexistent[..]")
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
@ -0,0 +1,79 @@
|
|||||||
|
From 27593a7ad3796cf3afaf4145275ff20d5aff333f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Wed, 10 Apr 2024 17:25:10 -0700
|
||||||
|
Subject: [PATCH 1/2] Set the host library path in run-make v2
|
||||||
|
|
||||||
|
When the build is configured with `[rust] rpath = false`, we need to set
|
||||||
|
`LD_LIBRARY_PATH` (or equivalent) to what would have been the `RPATH`,
|
||||||
|
so the compiler can find its own libraries. The old `tools.mk` code has
|
||||||
|
this environment prefixed in the `$(BARE_RUSTC)` variable, so we just
|
||||||
|
need to wire up something similar for run-make v2.
|
||||||
|
|
||||||
|
This is now set while building each `rmake.rs` itself, as well as in the
|
||||||
|
`rust-make-support` helpers for `rustc` and `rustdoc` commands. This is
|
||||||
|
also available in a `set_host_rpath` function for manual commands, like
|
||||||
|
in the `compiler-builtins` test.
|
||||||
|
|
||||||
|
(cherry picked from commit 8a5409bbdbadb522f25e7e5e3d54b967cb5eee56)
|
||||||
|
---
|
||||||
|
src/tools/compiletest/src/runtest.rs | 6 ++++++
|
||||||
|
src/tools/run-make-support/src/lib.rs | 15 +++++++++++++++
|
||||||
|
2 files changed, 21 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
|
||||||
|
index 7be0571b1111..3c775ea0651c 100644
|
||||||
|
--- a/src/tools/compiletest/src/runtest.rs
|
||||||
|
+++ b/src/tools/compiletest/src/runtest.rs
|
||||||
|
@@ -3767,6 +3767,11 @@ fn run_rmake_v2_test(&self) {
|
||||||
|
debug!(?support_lib_deps);
|
||||||
|
debug!(?support_lib_deps_deps);
|
||||||
|
|
||||||
|
+ let mut host_dylib_env_paths = String::new();
|
||||||
|
+ host_dylib_env_paths.push_str(&cwd.join(&self.config.compile_lib_path).to_string_lossy());
|
||||||
|
+ host_dylib_env_paths.push(':');
|
||||||
|
+ host_dylib_env_paths.push_str(&env::var(dylib_env_var()).unwrap());
|
||||||
|
+
|
||||||
|
let res = self.cmd2procres(
|
||||||
|
Command::new(&self.config.rustc_path)
|
||||||
|
.arg("-o")
|
||||||
|
@@ -3787,6 +3792,7 @@ fn run_rmake_v2_test(&self) {
|
||||||
|
.env("RUSTC", cwd.join(&self.config.rustc_path))
|
||||||
|
.env("TMPDIR", &tmpdir)
|
||||||
|
.env("LD_LIB_PATH_ENVVAR", dylib_env_var())
|
||||||
|
+ .env(dylib_env_var(), &host_dylib_env_paths)
|
||||||
|
.env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path))
|
||||||
|
.env("TARGET_RPATH_DIR", cwd.join(&self.config.run_lib_path))
|
||||||
|
.env("LLVM_COMPONENTS", &self.config.llvm_components)
|
||||||
|
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
|
||||||
|
index 674860f8413b..da3efd292b3f 100644
|
||||||
|
--- a/src/tools/run-make-support/src/lib.rs
|
||||||
|
+++ b/src/tools/run-make-support/src/lib.rs
|
||||||
|
@@ -11,6 +11,7 @@ pub fn out_dir() -> PathBuf {
|
||||||
|
fn setup_common_build_cmd() -> Command {
|
||||||
|
let rustc = env::var("RUSTC").unwrap();
|
||||||
|
let mut cmd = Command::new(rustc);
|
||||||
|
+ set_host_rpath(&mut cmd);
|
||||||
|
cmd.arg("--out-dir").arg(out_dir()).arg("-L").arg(out_dir());
|
||||||
|
cmd
|
||||||
|
}
|
||||||
|
@@ -157,3 +158,17 @@ pub fn run_fail(bin_name: &str) -> Output {
|
||||||
|
}
|
||||||
|
output
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+/// Set the runtime library path as needed for running the host rustc/rustdoc/etc.
|
||||||
|
+pub fn set_host_rpath(cmd: &mut Command) {
|
||||||
|
+ let ld_lib_path_envvar = env::var("LD_LIB_PATH_ENVVAR").unwrap();
|
||||||
|
+ cmd.env(&ld_lib_path_envvar, {
|
||||||
|
+ let mut paths = vec![];
|
||||||
|
+ paths.push(PathBuf::from(env::var("TMPDIR").unwrap()));
|
||||||
|
+ paths.push(PathBuf::from(env::var("HOST_RPATH_DIR").unwrap()));
|
||||||
|
+ for p in env::split_paths(&env::var(&ld_lib_path_envvar).unwrap()) {
|
||||||
|
+ paths.push(p.to_path_buf());
|
||||||
|
+ }
|
||||||
|
+ env::join_paths(paths.iter()).unwrap()
|
||||||
|
+ });
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
From 9a5034a20ed8b055dc615271f9d9cf27f9e494f0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Rousskov <mark.simulacrum@gmail.com>
|
|
||||||
Date: Mon, 5 Feb 2024 07:34:48 -0500
|
|
||||||
Subject: [PATCH] Step all bootstrap cfgs forward
|
|
||||||
|
|
||||||
This also takes care of other bootstrap-related changes.
|
|
||||||
---
|
|
||||||
src/tools/coverage-dump/src/covfun.rs | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/tools/coverage-dump/src/covfun.rs b/src/tools/coverage-dump/src/covfun.rs
|
|
||||||
index 3a5866dea3e0..49e3a6ed5838 100644
|
|
||||||
--- a/src/tools/coverage-dump/src/covfun.rs
|
|
||||||
+++ b/src/tools/coverage-dump/src/covfun.rs
|
|
||||||
@@ -219,7 +219,7 @@ pub(crate) fn decode(input: u32) -> Option<Self> {
|
|
||||||
enum MappingKind {
|
|
||||||
Code(CovTerm),
|
|
||||||
Gap(CovTerm),
|
|
||||||
- Expansion(u32),
|
|
||||||
+ Expansion(#[allow(dead_code)] u32),
|
|
||||||
Skip,
|
|
||||||
// Using raw identifiers here makes the dump output a little bit nicer
|
|
||||||
// (via the derived Debug), at the expense of making this tool's source
|
|
||||||
--
|
|
||||||
2.44.0
|
|
||||||
|
|
||||||
@ -0,0 +1,264 @@
|
|||||||
|
From 706f06c39a9e08a4708a53722429d13ae4069c2f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Wed, 1 May 2024 15:25:26 -0700
|
||||||
|
Subject: [PATCH] Use an explicit x86-64 cpu in tests that are sensitive to it
|
||||||
|
|
||||||
|
There are a few tests that depend on some target features **not** being
|
||||||
|
enabled by default, and usually they are correct with the default x86-64
|
||||||
|
target CPU. However, in downstream builds we have modified the default
|
||||||
|
to fit our distros -- `x86-64-v2` in RHEL 9 and `x86-64-v3` in RHEL 10
|
||||||
|
-- and the latter especially trips tests that expect not to have AVX.
|
||||||
|
|
||||||
|
These cases are few enough that we can just set them back explicitly.
|
||||||
|
---
|
||||||
|
tests/assembly/simd-intrinsic-mask-reduce.rs | 1 +
|
||||||
|
tests/assembly/x86_64-floating-point-clamp.rs | 2 +-
|
||||||
|
.../codegen/target-feature-inline-closure.rs | 2 +-
|
||||||
|
tests/ui/asm/x86_64/target-feature-attr.rs | 1 +
|
||||||
|
.../ui/asm/x86_64/target-feature-attr.stderr | 8 +++---
|
||||||
|
.../const-eval/const_fn_target_feature.rs | 2 +-
|
||||||
|
.../rfc-2396-target_feature-11/safe-calls.rs | 1 +
|
||||||
|
.../safe-calls.stderr | 28 +++++++++----------
|
||||||
|
tests/ui/sse2.rs | 4 +--
|
||||||
|
9 files changed, 26 insertions(+), 23 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/assembly/simd-intrinsic-mask-reduce.rs b/tests/assembly/simd-intrinsic-mask-reduce.rs
|
||||||
|
index 763401755fad..0d77fc410511 100644
|
||||||
|
--- a/tests/assembly/simd-intrinsic-mask-reduce.rs
|
||||||
|
+++ b/tests/assembly/simd-intrinsic-mask-reduce.rs
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
// verify that simd mask reductions do not introduce additional bit shift operations
|
||||||
|
//@ revisions: x86 aarch64
|
||||||
|
//@ [x86] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel
|
||||||
|
+//@ [x86] compile-flags: -C target-cpu=x86-64
|
||||||
|
//@ [x86] needs-llvm-components: x86
|
||||||
|
//@ [aarch64] compile-flags: --target=aarch64-unknown-linux-gnu
|
||||||
|
//@ [aarch64] needs-llvm-components: aarch64
|
||||||
|
diff --git a/tests/assembly/x86_64-floating-point-clamp.rs b/tests/assembly/x86_64-floating-point-clamp.rs
|
||||||
|
index 4a72a7f44fa0..b963aee35590 100644
|
||||||
|
--- a/tests/assembly/x86_64-floating-point-clamp.rs
|
||||||
|
+++ b/tests/assembly/x86_64-floating-point-clamp.rs
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
// so check to make sure that's what it's actually emitting.
|
||||||
|
|
||||||
|
//@ assembly-output: emit-asm
|
||||||
|
-//@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel
|
||||||
|
+//@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel -C target-cpu=x86-64
|
||||||
|
//@ only-x86_64
|
||||||
|
//@ ignore-sgx
|
||||||
|
|
||||||
|
diff --git a/tests/codegen/target-feature-inline-closure.rs b/tests/codegen/target-feature-inline-closure.rs
|
||||||
|
index 88bd413a8707..20bb4e66ff21 100644
|
||||||
|
--- a/tests/codegen/target-feature-inline-closure.rs
|
||||||
|
+++ b/tests/codegen/target-feature-inline-closure.rs
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
//@ only-x86_64
|
||||||
|
-//@ compile-flags: -Copt-level=3
|
||||||
|
+//@ compile-flags: -Copt-level=3 -Ctarget-cpu=x86-64
|
||||||
|
|
||||||
|
#![crate_type = "lib"]
|
||||||
|
#![feature(target_feature_11)]
|
||||||
|
diff --git a/tests/ui/asm/x86_64/target-feature-attr.rs b/tests/ui/asm/x86_64/target-feature-attr.rs
|
||||||
|
index 820be132ef79..51829be15065 100644
|
||||||
|
--- a/tests/ui/asm/x86_64/target-feature-attr.rs
|
||||||
|
+++ b/tests/ui/asm/x86_64/target-feature-attr.rs
|
||||||
|
@@ -1,4 +1,5 @@
|
||||||
|
//@ only-x86_64
|
||||||
|
+//@ compile-flags: -C target-cpu=x86-64
|
||||||
|
|
||||||
|
#![feature(avx512_target_feature)]
|
||||||
|
|
||||||
|
diff --git a/tests/ui/asm/x86_64/target-feature-attr.stderr b/tests/ui/asm/x86_64/target-feature-attr.stderr
|
||||||
|
index c852726ee7ff..1a9962732cfb 100644
|
||||||
|
--- a/tests/ui/asm/x86_64/target-feature-attr.stderr
|
||||||
|
+++ b/tests/ui/asm/x86_64/target-feature-attr.stderr
|
||||||
|
@@ -1,23 +1,23 @@
|
||||||
|
error: register class `ymm_reg` requires the `avx` target feature
|
||||||
|
- --> $DIR/target-feature-attr.rs:18:40
|
||||||
|
+ --> $DIR/target-feature-attr.rs:19:40
|
||||||
|
|
|
||||||
|
LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
|
||||||
|
| ^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: register class `ymm_reg` requires the `avx` target feature
|
||||||
|
- --> $DIR/target-feature-attr.rs:18:55
|
||||||
|
+ --> $DIR/target-feature-attr.rs:19:55
|
||||||
|
|
|
||||||
|
LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
|
||||||
|
| ^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: register class `ymm_reg` requires the `avx` target feature
|
||||||
|
- --> $DIR/target-feature-attr.rs:18:70
|
||||||
|
+ --> $DIR/target-feature-attr.rs:19:70
|
||||||
|
|
|
||||||
|
LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
|
||||||
|
| ^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: register class `kreg` requires at least one of the following target features: avx512bw, avx512f
|
||||||
|
- --> $DIR/target-feature-attr.rs:33:23
|
||||||
|
+ --> $DIR/target-feature-attr.rs:34:23
|
||||||
|
|
|
||||||
|
LL | asm!("/* {0} */", in(kreg) x);
|
||||||
|
| ^^^^^^^^^^
|
||||||
|
diff --git a/tests/ui/consts/const-eval/const_fn_target_feature.rs b/tests/ui/consts/const-eval/const_fn_target_feature.rs
|
||||||
|
index b56b68a57958..d0de9d8d7a34 100644
|
||||||
|
--- a/tests/ui/consts/const-eval/const_fn_target_feature.rs
|
||||||
|
+++ b/tests/ui/consts/const-eval/const_fn_target_feature.rs
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
//@ only-x86_64
|
||||||
|
-//@ compile-flags:-C target-feature=+ssse3
|
||||||
|
+//@ compile-flags: -C target-cpu=x86-64 -C target-feature=+ssse3
|
||||||
|
|
||||||
|
#![crate_type = "lib"]
|
||||||
|
|
||||||
|
diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
|
||||||
|
index c73b8d7e4d29..6fb0688008e6 100644
|
||||||
|
--- a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
|
||||||
|
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
|
||||||
|
@@ -1,4 +1,5 @@
|
||||||
|
//@ only-x86_64
|
||||||
|
+//@ compile-flags: -C target-cpu=x86-64
|
||||||
|
|
||||||
|
#![feature(target_feature_11)]
|
||||||
|
|
||||||
|
diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr
|
||||||
|
index d9d7e297f8e9..fed3da6594cb 100644
|
||||||
|
--- a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr
|
||||||
|
+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:25:5
|
||||||
|
+ --> $DIR/safe-calls.rs:26:5
|
||||||
|
|
|
||||||
|
LL | sse2();
|
||||||
|
| ^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -8,7 +8,7 @@ LL | sse2();
|
||||||
|
= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
|
||||||
|
|
||||||
|
error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:27:5
|
||||||
|
+ --> $DIR/safe-calls.rs:28:5
|
||||||
|
|
|
||||||
|
LL | avx_bmi2();
|
||||||
|
| ^^^^^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -16,7 +16,7 @@ LL | avx_bmi2();
|
||||||
|
= help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
|
||||||
|
|
||||||
|
error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:29:5
|
||||||
|
+ --> $DIR/safe-calls.rs:30:5
|
||||||
|
|
|
||||||
|
LL | Quux.avx_bmi2();
|
||||||
|
| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -24,7 +24,7 @@ LL | Quux.avx_bmi2();
|
||||||
|
= help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
|
||||||
|
|
||||||
|
error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:35:5
|
||||||
|
+ --> $DIR/safe-calls.rs:36:5
|
||||||
|
|
|
||||||
|
LL | avx_bmi2();
|
||||||
|
| ^^^^^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -32,7 +32,7 @@ LL | avx_bmi2();
|
||||||
|
= help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
|
||||||
|
|
||||||
|
error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:37:5
|
||||||
|
+ --> $DIR/safe-calls.rs:38:5
|
||||||
|
|
|
||||||
|
LL | Quux.avx_bmi2();
|
||||||
|
| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -40,7 +40,7 @@ LL | Quux.avx_bmi2();
|
||||||
|
= help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
|
||||||
|
|
||||||
|
error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:43:5
|
||||||
|
+ --> $DIR/safe-calls.rs:44:5
|
||||||
|
|
|
||||||
|
LL | sse2();
|
||||||
|
| ^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -49,7 +49,7 @@ LL | sse2();
|
||||||
|
= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
|
||||||
|
|
||||||
|
error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:45:5
|
||||||
|
+ --> $DIR/safe-calls.rs:46:5
|
||||||
|
|
|
||||||
|
LL | avx_bmi2();
|
||||||
|
| ^^^^^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -57,7 +57,7 @@ LL | avx_bmi2();
|
||||||
|
= help: in order for the call to be safe, the context requires the following additional target feature: bmi2
|
||||||
|
|
||||||
|
error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:47:5
|
||||||
|
+ --> $DIR/safe-calls.rs:48:5
|
||||||
|
|
|
||||||
|
LL | Quux.avx_bmi2();
|
||||||
|
| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -65,7 +65,7 @@ LL | Quux.avx_bmi2();
|
||||||
|
= help: in order for the call to be safe, the context requires the following additional target feature: bmi2
|
||||||
|
|
||||||
|
error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:54:5
|
||||||
|
+ --> $DIR/safe-calls.rs:55:5
|
||||||
|
|
|
||||||
|
LL | sse2();
|
||||||
|
| ^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -74,7 +74,7 @@ LL | sse2();
|
||||||
|
= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
|
||||||
|
|
||||||
|
error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:58:15
|
||||||
|
+ --> $DIR/safe-calls.rs:59:15
|
||||||
|
|
|
||||||
|
LL | const _: () = sse2();
|
||||||
|
| ^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -83,7 +83,7 @@ LL | const _: () = sse2();
|
||||||
|
= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
|
||||||
|
|
||||||
|
error[E0133]: call to function `sse2_and_fxsr` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||||
|
- --> $DIR/safe-calls.rs:61:15
|
||||||
|
+ --> $DIR/safe-calls.rs:62:15
|
||||||
|
|
|
||||||
|
LL | const _: () = sse2_and_fxsr();
|
||||||
|
| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -92,7 +92,7 @@ LL | const _: () = sse2_and_fxsr();
|
||||||
|
= note: the fxsr and sse2 target features being enabled in the build configuration does not remove the requirement to list them in `#[target_feature]`
|
||||||
|
|
||||||
|
error: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe block (error E0133)
|
||||||
|
- --> $DIR/safe-calls.rs:68:5
|
||||||
|
+ --> $DIR/safe-calls.rs:69:5
|
||||||
|
|
|
||||||
|
LL | sse2();
|
||||||
|
| ^^^^^^ call to function with `#[target_feature]`
|
||||||
|
@@ -101,12 +101,12 @@ LL | sse2();
|
||||||
|
= help: in order for the call to be safe, the context requires the following additional target feature: sse2
|
||||||
|
= note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
|
||||||
|
note: an unsafe function restricts its caller, but its body is safe by default
|
||||||
|
- --> $DIR/safe-calls.rs:67:1
|
||||||
|
+ --> $DIR/safe-calls.rs:68:1
|
||||||
|
|
|
||||||
|
LL | unsafe fn needs_unsafe_block() {
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
note: the lint level is defined here
|
||||||
|
- --> $DIR/safe-calls.rs:64:8
|
||||||
|
+ --> $DIR/safe-calls.rs:65:8
|
||||||
|
|
|
||||||
|
LL | #[deny(unsafe_op_in_unsafe_fn)]
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
diff --git a/tests/ui/sse2.rs b/tests/ui/sse2.rs
|
||||||
|
index fa6d79713b4b..c203ca2716ff 100644
|
||||||
|
--- a/tests/ui/sse2.rs
|
||||||
|
+++ b/tests/ui/sse2.rs
|
||||||
|
@@ -20,6 +20,6 @@ fn main() {
|
||||||
|
"SSE2 was not detected as available on an x86 platform");
|
||||||
|
}
|
||||||
|
// check a negative case too -- allowed on x86, but not enabled by default
|
||||||
|
- assert!(cfg!(not(target_feature = "avx2")),
|
||||||
|
- "AVX2 shouldn't be detected as available by default on any platform");
|
||||||
|
+ assert!(cfg!(not(target_feature = "avx512f")),
|
||||||
|
+ "AVX512 shouldn't be detected as available by default on any platform");
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
From f25809d2d33e1141d73487e55fe155f41762aef3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: onur-ozkan <work@onurozkan.dev>
|
||||||
|
Date: Sun, 10 Mar 2024 09:16:24 +0300
|
||||||
|
Subject: [PATCH] fix `long-linker-command-lines` failure caused by
|
||||||
|
`rust.rpath=false`
|
||||||
|
|
||||||
|
Signed-off-by: onur-ozkan <work@onurozkan.dev>
|
||||||
|
---
|
||||||
|
tests/run-make/long-linker-command-lines/Makefile | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/tests/run-make/long-linker-command-lines/Makefile b/tests/run-make/long-linker-command-lines/Makefile
|
||||||
|
index f864ea74f4a9..b573038e344a 100644
|
||||||
|
--- a/tests/run-make/long-linker-command-lines/Makefile
|
||||||
|
+++ b/tests/run-make/long-linker-command-lines/Makefile
|
||||||
|
@@ -1,6 +1,8 @@
|
||||||
|
# ignore-cross-compile
|
||||||
|
include ../tools.mk
|
||||||
|
|
||||||
|
+export LD_LIBRARY_PATH := $(HOST_RPATH_DIR)
|
||||||
|
+
|
||||||
|
all:
|
||||||
|
$(RUSTC) foo.rs -g -O
|
||||||
|
RUSTC="$(RUSTC_ORIGINAL)" $(call RUN,foo)
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
@ -1,82 +0,0 @@
|
|||||||
From 96e7b2767b30c215361d26626ef235f5ec0e8cd5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ralf Jung <post@ralfj.de>
|
|
||||||
Date: Fri, 16 Feb 2024 10:01:43 +0100
|
|
||||||
Subject: [PATCH] remove stderr-per-bitwidth from some tests
|
|
||||||
|
|
||||||
(cherry picked from commit f68e79dcac3acb635c58ff2fa4178b9a0b040fe4)
|
|
||||||
---
|
|
||||||
...ut_ref_in_final_dynamic_check.64bit.stderr | 20 -------------------
|
|
||||||
.../mut_ref_in_final_dynamic_check.rs | 3 ++-
|
|
||||||
... => mut_ref_in_final_dynamic_check.stderr} | 8 ++++----
|
|
||||||
3 files changed, 6 insertions(+), 25 deletions(-)
|
|
||||||
delete mode 100644 tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.64bit.stderr
|
|
||||||
rename tests/ui/consts/const-mut-refs/{mut_ref_in_final_dynamic_check.32bit.stderr => mut_ref_in_final_dynamic_check.stderr} (75%)
|
|
||||||
|
|
||||||
diff --git a/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.64bit.stderr b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.64bit.stderr
|
|
||||||
deleted file mode 100644
|
|
||||||
index fc68207512c0..000000000000
|
|
||||||
--- a/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.64bit.stderr
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1,20 +0,0 @@
|
|
||||||
-error[E0080]: it is undefined behavior to use this value
|
|
||||||
- --> $DIR/mut_ref_in_final_dynamic_check.rs:15:1
|
|
||||||
- |
|
|
||||||
-LL | const A: Option<&mut i32> = helper();
|
|
||||||
- | ^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(Some)>.0: encountered mutable reference in a `const` or `static`
|
|
||||||
- |
|
|
||||||
- = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
|
|
||||||
- = note: the raw bytes of the constant (size: 8, align: 8) {
|
|
||||||
- 2a 00 00 00 00 00 00 00 │ *.......
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
-error: encountered dangling pointer in final value of constant
|
|
||||||
- --> $DIR/mut_ref_in_final_dynamic_check.rs:22:1
|
|
||||||
- |
|
|
||||||
-LL | const B: Option<&mut i32> = helper2();
|
|
||||||
- | ^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
-
|
|
||||||
-error: aborting due to 2 previous errors
|
|
||||||
-
|
|
||||||
-For more information about this error, try `rustc --explain E0080`.
|
|
||||||
diff --git a/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
|
|
||||||
index 455b557b97c4..b98f4d920694 100644
|
|
||||||
--- a/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
|
|
||||||
+++ b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
-// stderr-per-bitwidth
|
|
||||||
+// normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
|
|
||||||
+// normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> "HEX_DUMP"
|
|
||||||
#![feature(const_mut_refs)]
|
|
||||||
#![feature(raw_ref_op)]
|
|
||||||
|
|
||||||
diff --git a/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.32bit.stderr b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.stderr
|
|
||||||
similarity index 75%
|
|
||||||
rename from tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.32bit.stderr
|
|
||||||
rename to tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.stderr
|
|
||||||
index 87420a037514..bb3c5518680b 100644
|
|
||||||
--- a/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.32bit.stderr
|
|
||||||
+++ b/tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.stderr
|
|
||||||
@@ -1,16 +1,16 @@
|
|
||||||
error[E0080]: it is undefined behavior to use this value
|
|
||||||
- --> $DIR/mut_ref_in_final_dynamic_check.rs:15:1
|
|
||||||
+ --> $DIR/mut_ref_in_final_dynamic_check.rs:16:1
|
|
||||||
|
|
|
||||||
LL | const A: Option<&mut i32> = helper();
|
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ constructing invalid value at .<enum-variant(Some)>.0: encountered mutable reference in a `const` or `static`
|
|
||||||
|
|
|
||||||
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
|
|
||||||
- = note: the raw bytes of the constant (size: 4, align: 4) {
|
|
||||||
- 2a 00 00 00 │ *...
|
|
||||||
+ = note: the raw bytes of the constant (size: $SIZE, align: $ALIGN) {
|
|
||||||
+ HEX_DUMP
|
|
||||||
}
|
|
||||||
|
|
||||||
error: encountered dangling pointer in final value of constant
|
|
||||||
- --> $DIR/mut_ref_in_final_dynamic_check.rs:22:1
|
|
||||||
+ --> $DIR/mut_ref_in_final_dynamic_check.rs:23:1
|
|
||||||
|
|
|
||||||
LL | const B: Option<&mut i32> = helper2();
|
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
--
|
|
||||||
2.44.0
|
|
||||||
|
|
||||||
@ -0,0 +1,63 @@
|
|||||||
|
From 642e12326055268c7605b31e7f91edf8f58e54d4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Josh Stone <jistone@redhat.com>
|
||||||
|
Date: Thu, 11 Apr 2024 15:33:44 -0700
|
||||||
|
Subject: [PATCH 2/2] Use `env::split_paths`/`join_paths` in runtest
|
||||||
|
|
||||||
|
(cherry picked from commit 7e171c72cbddb0636fa8ce71a0e862486ae72625)
|
||||||
|
---
|
||||||
|
src/tools/compiletest/src/runtest.rs | 31 ++++++++++++++--------------
|
||||||
|
1 file changed, 15 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
|
||||||
|
index 3c775ea0651c..852ffa0a62a8 100644
|
||||||
|
--- a/src/tools/compiletest/src/runtest.rs
|
||||||
|
+++ b/src/tools/compiletest/src/runtest.rs
|
||||||
|
@@ -3767,10 +3767,13 @@ fn run_rmake_v2_test(&self) {
|
||||||
|
debug!(?support_lib_deps);
|
||||||
|
debug!(?support_lib_deps_deps);
|
||||||
|
|
||||||
|
- let mut host_dylib_env_paths = String::new();
|
||||||
|
- host_dylib_env_paths.push_str(&cwd.join(&self.config.compile_lib_path).to_string_lossy());
|
||||||
|
- host_dylib_env_paths.push(':');
|
||||||
|
- host_dylib_env_paths.push_str(&env::var(dylib_env_var()).unwrap());
|
||||||
|
+ let orig_dylib_env_paths =
|
||||||
|
+ Vec::from_iter(env::split_paths(&env::var(dylib_env_var()).unwrap()));
|
||||||
|
+
|
||||||
|
+ let mut host_dylib_env_paths = Vec::new();
|
||||||
|
+ host_dylib_env_paths.push(cwd.join(&self.config.compile_lib_path));
|
||||||
|
+ host_dylib_env_paths.extend(orig_dylib_env_paths.iter().cloned());
|
||||||
|
+ let host_dylib_env_paths = env::join_paths(host_dylib_env_paths).unwrap();
|
||||||
|
|
||||||
|
let res = self.cmd2procres(
|
||||||
|
Command::new(&self.config.rustc_path)
|
||||||
|
@@ -3810,19 +3813,15 @@ fn run_rmake_v2_test(&self) {
|
||||||
|
// Finally, we need to run the recipe binary to build and run the actual tests.
|
||||||
|
debug!(?recipe_bin);
|
||||||
|
|
||||||
|
- let mut dylib_env_paths = String::new();
|
||||||
|
- dylib_env_paths.push_str(&env::var(dylib_env_var()).unwrap());
|
||||||
|
- dylib_env_paths.push(':');
|
||||||
|
- dylib_env_paths.push_str(&support_lib_path.parent().unwrap().to_string_lossy());
|
||||||
|
- dylib_env_paths.push(':');
|
||||||
|
- dylib_env_paths.push_str(
|
||||||
|
- &stage_std_path.join("rustlib").join(&self.config.host).join("lib").to_string_lossy(),
|
||||||
|
- );
|
||||||
|
+ let mut dylib_env_paths = orig_dylib_env_paths.clone();
|
||||||
|
+ dylib_env_paths.push(support_lib_path.parent().unwrap().to_path_buf());
|
||||||
|
+ dylib_env_paths.push(stage_std_path.join("rustlib").join(&self.config.host).join("lib"));
|
||||||
|
+ let dylib_env_paths = env::join_paths(dylib_env_paths).unwrap();
|
||||||
|
|
||||||
|
- let mut target_rpath_env_path = String::new();
|
||||||
|
- target_rpath_env_path.push_str(&tmpdir.to_string_lossy());
|
||||||
|
- target_rpath_env_path.push(':');
|
||||||
|
- target_rpath_env_path.push_str(&dylib_env_paths);
|
||||||
|
+ let mut target_rpath_env_path = Vec::new();
|
||||||
|
+ target_rpath_env_path.push(&tmpdir);
|
||||||
|
+ target_rpath_env_path.extend(&orig_dylib_env_paths);
|
||||||
|
+ let target_rpath_env_path = env::join_paths(target_rpath_env_path).unwrap();
|
||||||
|
|
||||||
|
let mut cmd = Command::new(&recipe_bin);
|
||||||
|
cmd.current_dir(&self.testpaths.file)
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
From 8eb48b4f4c6e3d48f2600159a75184ec4d74b249 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nikita Popov <npopov@redhat.com>
|
|
||||||
Date: Wed, 31 Jan 2024 15:08:08 +0100
|
|
||||||
Subject: [PATCH] Update data layouts in custom target tests for LLVM 18
|
|
||||||
|
|
||||||
Fixes https://github.com/rust-lang/rust/issues/120492.
|
|
||||||
---
|
|
||||||
tests/run-make/rust-lld-custom-target/custom-target.json | 2 +-
|
|
||||||
tests/run-make/rustdoc-target-spec-json-path/target.json | 2 +-
|
|
||||||
tests/run-make/target-specs/my-awesome-platform.json | 2 +-
|
|
||||||
.../target-specs/my-x86_64-unknown-linux-gnu-platform.json | 2 +-
|
|
||||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/run-make/rust-lld-custom-target/custom-target.json b/tests/run-make/rust-lld-custom-target/custom-target.json
|
|
||||||
index 7828a99f235c1..e2c64cbdb43c2 100644
|
|
||||||
--- a/tests/run-make/rust-lld-custom-target/custom-target.json
|
|
||||||
+++ b/tests/run-make/rust-lld-custom-target/custom-target.json
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
"arch": "x86_64",
|
|
||||||
"cpu": "x86-64",
|
|
||||||
"crt-static-respected": true,
|
|
||||||
- "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
|
|
||||||
+ "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
|
|
||||||
"dynamic-linking": true,
|
|
||||||
"env": "gnu",
|
|
||||||
"has-rpath": true,
|
|
||||||
diff --git a/tests/run-make/rustdoc-target-spec-json-path/target.json b/tests/run-make/rustdoc-target-spec-json-path/target.json
|
|
||||||
index 34357182c205e..c478f1196fae0 100644
|
|
||||||
--- a/tests/run-make/rustdoc-target-spec-json-path/target.json
|
|
||||||
+++ b/tests/run-make/rustdoc-target-spec-json-path/target.json
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
"arch": "x86_64",
|
|
||||||
"cpu": "x86-64",
|
|
||||||
"crt-static-respected": true,
|
|
||||||
- "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
|
|
||||||
+ "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
|
|
||||||
"dynamic-linking": true,
|
|
||||||
"env": "gnu",
|
|
||||||
"executables": true,
|
|
||||||
diff --git a/tests/run-make/target-specs/my-awesome-platform.json b/tests/run-make/target-specs/my-awesome-platform.json
|
|
||||||
index 00de3de05f07a..1673ef7bd54d1 100644
|
|
||||||
--- a/tests/run-make/target-specs/my-awesome-platform.json
|
|
||||||
+++ b/tests/run-make/target-specs/my-awesome-platform.json
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
{
|
|
||||||
- "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",
|
|
||||||
+ "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",
|
|
||||||
"linker-flavor": "gcc",
|
|
||||||
"llvm-target": "i686-unknown-linux-gnu",
|
|
||||||
"target-endian": "little",
|
|
||||||
diff --git a/tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json
|
|
||||||
index 6d5e964ed4fee..0cafce15a9fef 100644
|
|
||||||
--- a/tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json
|
|
||||||
+++ b/tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
{
|
|
||||||
"pre-link-args": {"gcc": ["-m64"]},
|
|
||||||
- "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
|
|
||||||
+ "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
|
|
||||||
"linker-flavor": "gcc",
|
|
||||||
"llvm-target": "x86_64-unknown-linux-gnu",
|
|
||||||
"target-endian": "little",
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
From 369fff6c0640fe89be9b915adaa83e66a022e00d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nikita Popov <npopov@redhat.com>
|
|
||||||
Date: Wed, 14 Feb 2024 16:26:20 +0100
|
|
||||||
Subject: [PATCH] Implicitly enable evex512 if avx512 is enabled
|
|
||||||
|
|
||||||
LLVM 18 requires the evex512 feature to allow use of zmm registers.
|
|
||||||
LLVM automatically sets it when using a generic CPU, but not when
|
|
||||||
`-C target-cpu` is specified. This will result either in backend
|
|
||||||
legalization crashes, or code unexpectedly using ymm instead of
|
|
||||||
zmm registers.
|
|
||||||
|
|
||||||
For now, make sure that `avx512*` features imply `evex512`. Long
|
|
||||||
term we'll probably have to deal with the AVX10 mess somehow.
|
|
||||||
---
|
|
||||||
compiler/rustc_codegen_llvm/src/llvm_util.rs | 4 ++++
|
|
||||||
tests/ui/asm/x86_64/evex512-implicit-feature.rs | 15 +++++++++++++++
|
|
||||||
2 files changed, 19 insertions(+)
|
|
||||||
create mode 100644 tests/ui/asm/x86_64/evex512-implicit-feature.rs
|
|
||||||
|
|
||||||
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs
|
|
||||||
index e48479c8da279..54e8ed85e3250 100644
|
|
||||||
--- a/compiler/rustc_codegen_llvm/src/llvm_util.rs
|
|
||||||
+++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs
|
|
||||||
@@ -266,6 +266,10 @@ pub fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> LLVMFeature<'a> {
|
|
||||||
("riscv32" | "riscv64", "fast-unaligned-access") if get_version().0 <= 17 => {
|
|
||||||
LLVMFeature::new("unaligned-scalar-mem")
|
|
||||||
}
|
|
||||||
+ // For LLVM 18, enable the evex512 target feature if a avx512 target feature is enabled.
|
|
||||||
+ ("x86", s) if get_version().0 >= 18 && s.starts_with("avx512") => {
|
|
||||||
+ LLVMFeature::with_dependency(s, TargetFeatureFoldStrength::EnableOnly("evex512"))
|
|
||||||
+ }
|
|
||||||
(_, s) => LLVMFeature::new(s),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/tests/ui/asm/x86_64/evex512-implicit-feature.rs b/tests/ui/asm/x86_64/evex512-implicit-feature.rs
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000..a15060857eccb
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/ui/asm/x86_64/evex512-implicit-feature.rs
|
|
||||||
@@ -0,0 +1,15 @@
|
|
||||||
+// build-pass
|
|
||||||
+// only-x86_64
|
|
||||||
+// compile-flags: --crate-type=lib -C target-cpu=skylake
|
|
||||||
+
|
|
||||||
+#![feature(avx512_target_feature)]
|
|
||||||
+#![feature(stdsimd)]
|
|
||||||
+
|
|
||||||
+use std::arch::x86_64::*;
|
|
||||||
+
|
|
||||||
+#[target_feature(enable = "avx512f")]
|
|
||||||
+#[no_mangle]
|
|
||||||
+pub unsafe fn test(res: *mut f64, p: *const f64) {
|
|
||||||
+ let arg = _mm512_load_pd(p);
|
|
||||||
+ _mm512_store_pd(res, _mm512_fmaddsub_pd(arg, arg, arg));
|
|
||||||
+}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
|
|
||||||
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-02-14 13:00:20.318976752 +0100
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-02-14 13:00:28.447051475 +0100
|
|
||||||
@@ -2110,7 +2110,6 @@ version = "0.27.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
|
|
||||||
dependencies = [
|
|
||||||
- "cc",
|
|
||||||
"pkg-config",
|
|
||||||
"vcpkg",
|
|
||||||
]
|
|
||||||
diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
|
|
||||||
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-02-14 13:00:14.942927327 +0100
|
|
||||||
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-02-14 13:00:40.688164017 +0100
|
|
||||||
@@ -77,7 +77,7 @@ proptest = "1.4.0"
|
|
||||||
pulldown-cmark = { version = "0.9.3", default-features = false }
|
|
||||||
rand = "0.8.5"
|
|
||||||
regex = "1.10.2"
|
|
||||||
-rusqlite = { version = "0.30.0", features = ["bundled"] }
|
|
||||||
+rusqlite = { version = "0.30.0", features = [] }
|
|
||||||
rustfix = { version = "0.8.0", path = "crates/rustfix" }
|
|
||||||
same-file = "1.0.6"
|
|
||||||
security-framework = "2.9.2"
|
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
|
||||||
|
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-04-04 14:54:45.433205012 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-04-04 14:55:51.949342725 -0700
|
||||||
|
@@ -2149,7 +2149,6 @@ version = "0.28.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
|
||||||
|
dependencies = [
|
||||||
|
- "cc",
|
||||||
|
"pkg-config",
|
||||||
|
"vcpkg",
|
||||||
|
]
|
||||||
|
diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
|
||||||
|
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-04-04 14:54:45.433205012 -0700
|
||||||
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-04-04 14:55:35.823551771 -0700
|
||||||
|
@@ -77,7 +77,7 @@ proptest = "1.4.0"
|
||||||
|
pulldown-cmark = { version = "0.10.0", default-features = false, features = ["html"] }
|
||||||
|
rand = "0.8.5"
|
||||||
|
regex = "1.10.3"
|
||||||
|
-rusqlite = { version = "0.31.0", features = ["bundled"] }
|
||||||
|
+rusqlite = { version = "0.31.0", features = [] }
|
||||||
|
rustfix = { version = "0.8.2", path = "crates/rustfix" }
|
||||||
|
same-file = "1.0.6"
|
||||||
|
security-framework = "2.9.2"
|
||||||
Loading…
Reference in new issue