diff options
| author | antoyo <antoyo@users.noreply.github.com> | 2022-11-25 15:12:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 15:12:29 -0500 |
| commit | 0a54f243f61cc44034af3c483dbe8bd99b76ce15 (patch) | |
| tree | eb1285e178c219347828331080691018eb648d13 /src | |
| parent | 8520bc7f9f1d9bf5f5418e35fa8e4b3c9626e9c2 (diff) | |
| parent | 054696e4a3c8e91ed5e880f41a0c42632d8b19b7 (diff) | |
| download | rust-0a54f243f61cc44034af3c483dbe8bd99b76ce15.tar.gz rust-0a54f243f61cc44034af3c483dbe8bd99b76ce15.zip | |
Merge pull request #225 from rust-lang/feature/stdarch-tests
Run stdarch tests in the CI
Diffstat (limited to 'src')
| -rw-r--r-- | src/base.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/base.rs b/src/base.rs index 6e1ad9f5315..ed3daddf43e 100644 --- a/src/base.rs +++ b/src/base.rs @@ -101,7 +101,7 @@ pub fn compile_codegen_unit<'tcx>(tcx: TyCtxt<'tcx>, cgu_name: Symbol, supports_ context.add_command_line_option("-m64"); context.add_command_line_option("-mbmi"); context.add_command_line_option("-mgfni"); - context.add_command_line_option("-mavxvnni"); + //context.add_command_line_option("-mavxvnni"); // The CI doesn't support this option. context.add_command_line_option("-mf16c"); context.add_command_line_option("-maes"); context.add_command_line_option("-mxsavec"); diff --git a/src/lib.rs b/src/lib.rs index e43ee5cf21d..e52ee4818f3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -316,7 +316,8 @@ pub fn target_features(sess: &Session, allow_unstable: bool) -> Vec<Symbol> { // gcc -march=native -Q --help=target #[cfg(feature="master")] { - (_feature.contains("sse") || _feature.contains("avx")) && !_feature.contains("avx512") + // NOTE: the CPU in the CI doesn't support sse4a, so disable it to make the stdarch tests pass in the CI. + (_feature.contains("sse") || _feature.contains("avx")) && !_feature.contains("avx512") && !_feature.contains("sse4a") } #[cfg(not(feature="master"))] { |