fix: rust nightly programs

hanabi1224 · hanabi1224 · commit 559d07161c0d · 2022-09-02T20:45:22.000+08:00
diff --git a/bench/algorithm/mandelbrot/9.rs b/bench/algorithm/mandelbrot/9.rs
@@ -9,7 +9,7 @@
 
 #![feature(portable_simd)]
 
-use std::simd::{f64x8, StdFloat};
+use std::simd::{f64x8, SimdFloat, StdFloat};
 
 const MAX_ITER: usize = 50;
 const VLEN: usize = 8;
diff --git a/bench/algorithm/nbody/3.rs b/bench/algorithm/nbody/3.rs
@@ -8,7 +8,7 @@
 #![feature(portable_simd)]
 
 use std::f64::consts::PI;
-use std::simd::f64x4;
+use std::simd::{f64x4, SimdFloat};
 
 const SOLAR_MASS: f64 = 4.0 * PI * PI;
 const YEAR: f64 = 365.24;
@@ -20,7 +20,7 @@ macro_rules! planet {
         Planet {
             position: f64x4::from_array([$x, $y, $z, 0.0]),
             velocity: f64x4::from_array([$vx, $vy, $vz, 0.0]),
-            mass_ratio: f64x4::splat($mass_ratio),
+            mass_ratio: f64x4::from_array([$mass_ratio, $mass_ratio, $mass_ratio, $mass_ratio]),
             mass: $mass_ratio * SOLAR_MASS,
             mass_half: $mass_ratio * SOLAR_MASS * 0.5,
         }
diff --git a/bench/algorithm/spectral-norm/8-m.rs b/bench/algorithm/spectral-norm/8-m.rs
@@ -14,17 +14,17 @@
 
 use rayon::prelude::*;
 use std::ops::*;
-use std::simd::Simd;
+use std::simd::{Simd, SimdFloat};
 
 const LANES: usize = 4;
 type IntType = i32;
 const LANES_INT: IntType = LANES as IntType;
 type F64Vec = Simd<f64, LANES>;
 type IntVec = Simd<IntType, LANES>;
 
-const ONE: IntVec = IntVec::splat(1);
-const TWO: IntVec = IntVec::splat(2);
-const LANES_VEC: IntVec = IntVec::splat(LANES_INT);
+const ONE: IntVec = IntVec::from_array([1, 1, 1, 1]);
+const TWO: IntVec = IntVec::from_array([2, 2, 2, 2]);
+const LANES_VEC: IntVec = IntVec::from_array([LANES_INT, LANES_INT, LANES_INT, LANES_INT]);
 const J_ARRAY: IntVec = IntVec::from_array([0, 1, 2, 3]);
 
 fn main() {
diff --git a/bench/algorithm/spectral-norm/8.rs b/bench/algorithm/spectral-norm/8.rs
@@ -14,17 +14,17 @@
 #![feature(portable_simd)]
 
 use std::ops::*;
-use std::simd::Simd;
+use std::simd::{Simd, SimdFloat};
 
 const LANES: usize = 4;
 type IntType = i32;
 const LANES_INT: IntType = LANES as IntType;
 type F64Vec = Simd<f64, LANES>;
 type IntVec = Simd<IntType, LANES>;
 
-const ONE: IntVec = IntVec::splat(1);
-const TWO: IntVec = IntVec::splat(2);
-const LANES_VEC: IntVec = IntVec::splat(LANES_INT);
+const ONE: IntVec = IntVec::from_array([1, 1, 1, 1]);
+const TWO: IntVec = IntVec::from_array([2, 2, 2, 2]);
+const LANES_VEC: IntVec = IntVec::from_array([LANES_INT, LANES_INT, LANES_INT, LANES_INT]);
 const J_ARRAY: IntVec = IntVec::from_array([0, 1, 2, 3]);
 
 fn main() {
diff --git a/bench/bench_rust.yaml b/bench/bench_rust.yaml
@@ -85,7 +85,7 @@ problems:
       - 0.rs
       - 1.rs
 source_rename_to: main.rs
-compiler_version_command: rustc +stable -V
+compiler_version_command: rustc -V
 compiler_version_regex:
 runtime_version_parameter:
 runtime_version_regex:
@@ -103,7 +103,7 @@ environments:
       CXX: clang++
     include: rust
     include_sub_dir: src
-    build: cargo +stable build --release --target-dir /tmp/rs/target -v
+    build: cargo build --release --target-dir /tmp/rs/target -v
     after_build:
       - sudo mv /tmp/rs/target/release/_app out
     out_dir: out
diff --git a/bench/bench_rust_nightly.yaml b/bench/bench_rust_nightly.yaml
@@ -18,7 +18,7 @@ problems:
       - 8.rs
       - 8-m.rs
 source_rename_to: main.rs
-compiler_version_command: rustc +nightly -V
+compiler_version_command: rustc -V
 compiler_version_regex:
 runtime_version_parameter:
 runtime_version_regex:
@@ -32,7 +32,7 @@ environments:
       CXX: clang++
     include: rust-nightly
     include_sub_dir: src
-    build: cargo +nightly build --release --target-dir /tmp/rsn/target -v
+    build: cargo build --release --target-dir /tmp/rsn/target -v
     after_build:
       - sudo mv /tmp/rsn/target/release/_app out
     out_dir: out
diff --git a/bench/bench_wasm.yaml b/bench/bench_wasm.yaml
@@ -63,7 +63,6 @@ environments:
     include: rust
     include_sub_dir: src
     before_build:
-      - rustup target add wasm32-wasi
       - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
     build: wasmer create-exe --llvm --enable-all -o out/app /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm
     out_dir: out
@@ -78,7 +77,6 @@ environments:
     include: rust
     include_sub_dir: src
     before_build:
-      - rustup target add wasm32-wasi
       - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
     build: mv /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm out
     out_dir: out
@@ -92,7 +90,6 @@ environments:
     include: rust
     include_sub_dir: src
     before_build:
-      - rustup target add wasm32-wasi
       - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
     build: mv /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm out && cp wrapper.js out
     out_dir: out
@@ -109,7 +106,6 @@ environments:
     include: rust
     include_sub_dir: src
     before_build:
-      - rustup target add wasm32-wasi
       - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
       - deno bundle --unstable wrapper.ts app.ts
     build: deno compile --no-check --unstable --allow-env --allow-read -o out/app app.ts
diff --git a/bench/bench_wasm_graal.yaml b/bench/bench_wasm_graal.yaml
@@ -54,7 +54,6 @@ environments:
     include: rust
     include_sub_dir: src
     before_build:
-      - rustup target add wasm32-wasi
       - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
     build: mv /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm out
     out_dir: out
diff --git a/bench/bench_wasm_wasm_edge.yaml b/bench/bench_wasm_wasm_edge.yaml
@@ -35,9 +35,9 @@ problems:
   - name: edigits
     source:
       - 1.rs
-  # - name: coro-prime-sieve
-  #   source:
-  #     - 3.rs
+  - name: coro-prime-sieve
+    source:
+      - 3.rs
   - name: nsieve
     source:
       - 1.rs
@@ -63,7 +63,6 @@ environments:
     include: rust
     include_sub_dir: src
     before_build:
-      - rustup target add wasm32-wasi
       - cargo build --release --target wasm32-wasi --no-default-features --features wasm --target-dir /tmp/rustwasm/target
     build: wasmedgec --enable-all --generic-binary /tmp/rustwasm/target/wasm32-wasi/release/_app.wasm out/app.so
     out_dir: out
diff --git a/bench/include/kotlin-native/gradle/libs.versions.toml b/bench/include/kotlin-native/gradle/libs.versions.toml
@@ -2,6 +2,6 @@
 
 [libraries]
 bignum = {module = "com.ionspin.kotlin:bignum", version = "0.3.7"}
-kbignum = {module = "com.soywiz.korlibs.kbignum:kbignum", version = "3.0.0"}
+kbignum = {module = "com.soywiz.korlibs.kbignum:kbignum", version = "3.0.1"}
 
 [bundles]
diff --git a/bench/include/rust-nightly/.gitignore b/bench/include/rust-nightly/.gitignore
@@ -1,2 +1,3 @@
 !Cargo.toml
+!rust-toolchain.toml
 !.cargo
diff --git a/bench/include/rust-nightly/rust-toolchain.toml b/bench/include/rust-nightly/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly"
diff --git a/bench/include/rust/.gitignore b/bench/include/rust/.gitignore
@@ -1,4 +1,5 @@
 !Cargo.toml
+!rust-toolchain.toml
 !*.js
 !*.ts
 !self_signed_certs/
diff --git a/bench/include/rust/Cargo.toml b/bench/include/rust/Cargo.toml
@@ -55,7 +55,7 @@ axum-server = {version = "0.4", optional = true, features = ["tls-rustls"]}
 flume = {version = "0", optional = true}
 futures-lite = {version = "1", optional = true}
 reqwest = {version = "0.11", optional = true, default-features = false, features = ["json", "rustls-tls"]}
-tokio = {version = "1", optional = true}
+tokio = {version = "~1.20", optional = true}
 warp = {version = "0.3", optional = true, features = ["tls"]}
 
 [profile.release]
diff --git a/bench/include/rust/rust-toolchain.toml b/bench/include/rust/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "stable"
+targets = ["wasm32-wasi"]
diff --git a/bench/update.sh b/bench/update.sh
@@ -11,3 +11,11 @@ popd
 pushd include/kotlin-native
 ./gradlew du
 popd
+
+pushd include/rust
+cargo update
+popd
+
+pushd include/rust-nightly
+cargo +nightly update
+popd
