nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

rewrite simd-ffi to rmake

Browse Source
This commit is contained in:
Oneirical 2024-08-05 15:07:33 -04:00
parent 2b78d92096
commit 1054054a46
3 changed files with 63 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View File

@ -29,7 +29,6 @@ run-make/redundant-libs/Makefile
run-make/remap-path-prefix-dwarf/Makefile
run-make/reproducible-build/Makefile
run-make/rlib-format-packed-bundled-libs/Makefile
run-make/simd-ffi/Makefile
run-make/split-debuginfo/Makefile
run-make/staticlib-dylib-linkage/Makefile
run-make/symbol-mangling-hashed/Makefile

47
tests/run-make/simd-ffi/Makefile
View File

@ -1,47 +0,0 @@
include ../tools.mk
TARGETS =
ifeq ($(filter arm,$(LLVM_COMPONENTS)),arm)
# construct a fairly exhaustive list of platforms that we
# support. These ones don't follow a pattern
TARGETS += arm-linux-androideabi arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabi
endif
ifeq ($(filter x86,$(LLVM_COMPONENTS)),x86)
X86_ARCHS = i686 x86_64
else
X86_ARCHS =
endif
# these ones do, each OS lists the architectures it supports
LINUX=$(filter aarch64 mips,$(LLVM_COMPONENTS)) $(X86_ARCHS)
ifeq ($(filter mips,$(LLVM_COMPONENTS)),mips)
LINUX += mipsel
endif
WINDOWS=$(X86_ARCHS)
# fails with: failed to get iphonesimulator SDK path: no such file or directory
#IOS=i386 aarch64 armv7
DARWIN=$(X86_ARCHS)
$(foreach arch,$(LINUX),$(eval TARGETS += $(arch)-unknown-linux-gnu))
$(foreach arch,$(WINDOWS),$(eval TARGETS += $(arch)-pc-windows-gnu))
#$(foreach arch,$(IOS),$(eval TARGETS += $(arch)-apple-ios))
$(foreach arch,$(DARWIN),$(eval TARGETS += $(arch)-apple-darwin))
all: $(TARGETS)
define MK_TARGETS
# compile the rust file to the given target, but only to asm and IR
# form, to avoid having to have an appropriate linker.
#
# we need some features because the integer SIMD instructions are not
# enabled by-default for i686 and ARM; these features will be invalid
# on some platforms, but LLVM just prints a warning so that's fine for
# now.
$(1): simd.rs
$$(RUSTC) --target=$(1) --emit=llvm-ir,asm simd.rs \
-C target-feature='+neon,+sse2' -C extra-filename=-$(1)
endef
$(foreach targetxxx,$(TARGETS),$(eval $(call MK_TARGETS,$(targetxxx))))

63
tests/run-make/simd-ffi/rmake.rs Normal file
View File

@ -0,0 +1,63 @@
// Using SIMD types in a program with foreign-function interfaces used to result in an ICE
// (internal compiler error). Since this was fixed in #21233, it should be checked that
// compilation of SIMD and FFI together should be successful on all the most common
// architectures.
// Note that this test does not check linking or binary execution.
// See https://github.com/rust-lang/rust/pull/21233
use run_make_support::{llvm_components_contain, rustc};
fn main() {
let mut targets = Vec::new();
// arm-specific targets.
if llvm_components_contain("arm") {
targets.append(&mut vec![
"arm-linux-androideabi".to_owned(),
"arm-unknown-linux-gnueabihf".to_owned(),
"arm-unknown-linux-gnueabi".to_owned(),
]);
}
let mut x86_archs = Vec::new();
if llvm_components_contain("x86") {
x86_archs.append(&mut vec!["i686", "x86_64"]);
}
// Linux has all x86 targets, plus aarch64 and mips.
let mut extra_targets = x86_archs.clone();
if llvm_components_contain("aarch64") {
extra_targets.push("aarch64");
}
if llvm_components_contain("mips") {
extra_targets.append(&mut vec!["mips", "mipsel"]);
}
for target in extra_targets {
let linux = format!("{target}-unknown-linux-gnu");
targets.push(linux);
}
// Windows and Darwin (OSX) only receive x86 targets.
let extra_targets = x86_archs.clone();
for target in extra_targets {
let windows = format!("{target}-pc-windows-gnu");
let darwin = format!("{target}-apple-darwin");
targets.push(windows);
targets.push(darwin);
}
for target in targets {
// compile the rust file to the given target, but only to asm and IR
// form, to avoid having to have an appropriate linker.
//
// we need some features because the integer SIMD instructions are not
// enabled by-default for i686 and ARM; these features will be invalid
// on some platforms, but LLVM just prints a warning so that's fine for
// now.
rustc()
.target(&target)
.emit("llvm-ir,asm")
.input("simd.rs")
.arg("-Ctarget-feature=+neon,+sse")
.arg(&format!("-Cextra-filename=-{target}"))
.run();
}
}