Skip to content

Commit 71411d9

Browse files
gnzlbggnzlbg
committed
use mips64r2-generic
1 parent a62fccc commit 71411d9

File tree

8 files changed

+72
-99
lines changed

8 files changed

+72
-99
lines changed

‎.travis.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,14 @@ rust: nightly
55
matrix:
66
fast_finish: true
77
include:
8-
- env: TARGET=i586-unknown-linux-gnu
9-
- env: TARGET=i686-unknown-linux-gnu
10-
- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
11-
- env: TARGET=x86_64-unknown-linux-gnu-emulated NO_ADD=1 STDSIMD_TEST_EVERYTHING=1 FEATURES="intel_sde"
12-
- env: TARGET=arm-unknown-linux-gnueabihf
13-
- env: TARGET=armv7-unknown-linux-gnueabihf
14-
- env: TARGET=aarch64-unknown-linux-gnu
8+
#- env: TARGET=i586-unknown-linux-gnu
9+
#- env: TARGET=i686-unknown-linux-gnu
10+
#- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
11+
#- env: TARGET=x86_64-unknown-linux-gnu-emulated NO_ADD=1 STDSIMD_TEST_EVERYTHING=1 FEATURES="intel_sde"
12+
#- env: TARGET=arm-unknown-linux-gnueabihf
13+
#- env: TARGET=armv7-unknown-linux-gnueabihf
14+
#- env: TARGET=aarch64-unknown-linux-gnu
1515
- env: TARGET=mips64-unknown-linux-gnuabi64
16-
- env: TARGET=mips64el-unknown-linux-gnuabi64
17-
- env: TARGET=powerpc-unknown-linux-gnu
18-
- env: TARGET=powerpc64-unknown-linux-gnu
19-
- env: TARGET=powerpc64le-unknown-linux-gnu
20-
- os: osx
21-
env: TARGET=i686-apple-darwin
22-
script: ci/run.sh
23-
- os: osx
24-
env: TARGET=x86_64-apple-darwin NO_ADD=1
25-
script: ci/run.sh
26-
- env: DOCUMENTATION
27-
install: true
28-
script: ci/dox.sh
29-
- script: cargo test --manifest-path crates/stdsimd-verify/Cargo.toml
30-
install: true
3116
- env: TARGET=wasm32-unknown-unknown
3217
before_script:
3318
- git clone --recursive https://github.com/WebAssembly/wabt
@@ -41,17 +26,32 @@ matrix:
4126
- cat wasm.wat
4227
- grep current_memory wasm.wat
4328
- grep grow_memory wasm.wat
44-
- env: RUSTFMT=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
45-
before_script:
46-
- rustup component add rustfmt-preview
47-
script:
48-
- cargo fmt --all -- --write-mode=diff
49-
- env: CLIPPY=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
50-
script: |
51-
cargo install clippy
52-
cargo clippy --all -- -D clippy-pedantic
53-
allow_failures:
54-
- env: CLIPPY=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
29+
#- env: TARGET=mips64el-unknown-linux-gnuabi64
30+
#- env: TARGET=powerpc-unknown-linux-gnu
31+
#- env: TARGET=powerpc64-unknown-linux-gnu
32+
#- env: TARGET=powerpc64le-unknown-linux-gnu
33+
#- os: osx
34+
# env: TARGET=i686-apple-darwin
35+
# script: ci/run.sh
36+
#- os: osx
37+
# env: TARGET=x86_64-apple-darwin NO_ADD=1
38+
# script: ci/run.sh
39+
#- env: DOCUMENTATION
40+
# install: true
41+
# script: ci/dox.sh
42+
#- script: cargo test --manifest-path crates/stdsimd-verify/Cargo.toml
43+
# install: true
44+
#- env: RUSTFMT=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
45+
# before_script:
46+
# - rustup component add rustfmt-preview
47+
# script:
48+
# - cargo fmt --all -- --write-mode=diff
49+
#- env: CLIPPY=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
50+
# script: |
51+
# cargo install clippy
52+
# cargo clippy --all -- -D clippy-pedantic
53+
#allow_failures:
54+
#- env: CLIPPY=On TARGET=x86_64-unknown-linux-gnu NO_ADD=1
5555

5656
before_install:
5757
# FIXME (travis-ci/travis-ci#8920) shouldn't be necessary...

‎ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
1-
FROM ubuntu:17.10
1+
FROM debian:testing
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
5-
gcc-mips64-linux-gnuabi64 libc6-dev-mips64-cross \
5+
gcc-mips64-linux-gnuabi64 \
6+
libc6-dev-mips64r6-cross \
67
qemu-system-mips64 file make
78

9+
RUN wget http://codescape-mips-sdk.imgtec.com/components/toolchain/2015.01-7/Codescape.GNU.Tools.Package.2015.01-7.for.MIPS.IMG.Linux.CentOS-5.x86_64.tar.gz
10+
RUN tar xf Codescape.GNU.Tools.Package.2015.01-7.for.MIPS.IMG.Linux.CentOS-5.x86_64.tar.gz
11+
12+
ENV TCPATH=path/to/mips-img-linux-gnu/2015.01-7
13+
ENV PREFIX=${TCPATH}/bin/mips-img-linux-gnu-
14+
ENV CC=${PREFIX}gcc
15+
ENV CXX=${PREFIX}g++
16+
ENV AR=${PREFIX}ar
17+
ENV RANLIB=${PREFIX}ranlib
18+
ENV LINK=$CXX
19+
ENV OBJD=${PREFIX}objdump
20+
ENV GDB=${PREFIX}gdb
21+
ENV RDE=${PREFIX}readelf
22+
823
ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER=mips64-linux-gnuabi64-gcc \
924
CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_RUNNER="qemu-mips64 -cpu I6400 -L /usr/mips64-linux-gnuabi64" \
1025
CC_mips64_unknown_linux_gnuabi64=mips64-linux-gnuabi64-gcc \
26+
CFLAGS_mips64_unknown_linux_gnuabi64="-march=mips64r6 -I/usr/mipsisa64r6-linux-gnuabi64/include" \
1127
OBJDUMP=mips64-linux-gnuabi64-objdump

‎ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM ubuntu:17.10
1+
FROM debian:testing
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \
5-
gcc-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \
5+
gcc-mips64el-linux-gnuabi64 libc6-dev-mips64r6el-cross \
66
qemu-system-mips64el file make
77

88
ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER=mips64el-linux-gnuabi64-gcc \

‎ci/run.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
set -ex
3+
#set -ex
44

55
# Tests are all super fast anyway, and they fault often enough on travis that
66
# having only one thread increases debuggability to be worth it.
@@ -31,6 +31,7 @@ cargo_test() {
3131
cmd="$cmd -p coresimd -p stdsimd --manifest-path crates/stdsimd/Cargo.toml"
3232
cmd="$cmd -- $2"
3333
$cmd
34+
more /checkout/target/mips64-unknown-linux-gnuabi64/debug/build/backtrace-sys-3428ad8e56e1b724/out/config.log
3435
}
3536

3637
cargo_test

‎coresimd/mips64/mod.rs

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎coresimd/mips64/msa.rs

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎coresimd/mod.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,17 @@ pub mod arch {
8383
/// Platform-specific intrinsics for the `mips` platform.
8484
///
8585
/// See the [module documentation](../index.html) for more details.
86+
#[cfg(target_arch = "mips")]
87+
pub mod mips {
88+
pub use coresimd::mips::*;
89+
}
90+
91+
/// Platform-specific intrinsics for the `mips64` platform.
92+
///
93+
/// See the [module documentation](../index.html) for more details.
8694
#[cfg(target_arch = "mips64")]
8795
pub mod mips64 {
88-
pub use coresimd::mips64::*;
96+
pub use coresimd::mips::*;
8997
}
9098
}
9199

@@ -103,7 +111,7 @@ mod aarch64;
103111
#[cfg(target_arch = "wasm32")]
104112
mod wasm32;
105113

106-
#[cfg(target_arch = "mips64")]
107-
mod mips64;
114+
#[cfg(target_arch = "mips")]
115+
mod mips;
108116

109117
mod nvptx;

‎crates/coresimd/src/lib.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,9 @@ use _core::ptr;
8383
use _core::result;
8484
#[allow(unused_imports)]
8585
use _core::slice;
86+
87+
pub fn foo() -> coresimd::simd::i8x16 {
88+
use coresimd::simd::i8x16;
89+
let a = i8x16::splat(1);
90+
unsafe { coresimd::arch::mips::__msa_add_a_b(a, a) }
91+
}

0 commit comments

Comments
 (0)