Merge rust-lang#132

132: add newlib support to the test generator r=japaric a=japaric



Co-authored-by: Jorge Aparicio <[email protected]>

Author: bors[bot]

.gitignore

@@ -1,5 +1,8 @@
 **/*.rs.bk
 .#*
+/bin
+/math/src
+/math/target
 /target
 /tests
 Cargo.lock

.travis.yml

@@ -5,28 +5,37 @@ sudo: required
 matrix:
   include:
     - env: TARGET=aarch64-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=armv7-unknown-linux-gnueabihf
+      rust: nightly
     - env: TARGET=i686-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=mips-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=mips64-unknown-linux-gnuabi64
+      rust: nightly
     - env: TARGET=mips64el-unknown-linux-gnuabi64
+      rust: nightly
     - env: TARGET=mipsel-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=powerpc-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=powerpc64-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=powerpc64le-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=x86_64-unknown-linux-gnu
+      rust: nightly
     - env: TARGET=cargo-fmt
       rust: beta
-      # no-panic link test
-    - env: TARGET=armv7-unknown-linux-gnueabihf
-      rust: nightly
 
 before_install: set -e
 
 install:
   - bash ci/install.sh
 
 script:
+  - export PATH=$HOME/.local/bin:$PATH
   - bash ci/script.sh
 
 after_script: set +e

Cargo.toml

@@ -14,4 +14,13 @@ version = "0.1.2"
 checked = []
 
 [workspace]
-members = ["cb", "test-generator"]
+members = [
+  "cb",
+  "input-generator",
+  "musl-generator",
+  "newlib-generator",
+  "shared",
+]
+
+[dev-dependencies]
+shared = { path = "shared" }

ci/install.sh

@@ -15,6 +15,11 @@ main() {
     if [ $TARGET != x86_64-unknown-linux-gnu ]; then
         rustup target add $TARGET
     fi
+
+    mkdir -p ~/.local/bin
+    curl -L https://github.com/japaric/qemu-bin/raw/master/14.04/qemu-arm-2.12.0 > ~/.local/bin/qemu-arm
+    chmod +x ~/.local/bin/qemu-arm
+    qemu-arm --version
 }
 
 main

ci/script.sh

@@ -6,24 +6,27 @@ main() {
         return
     fi
 
-    # test that the functions don't contain invocations of `panic!`
-    if [ $TRAVIS_RUST_VERSION = nightly ]; then
-        cross build --release --target $TARGET --example no-panic
-        return
-    fi
-
     # quick check
     cargo check
 
     # check that we can source import libm into compiler-builtins
     cargo check --package cb
 
+    # generate tests
+    cargo run -p input-generator --target x86_64-unknown-linux-musl
+    cargo run -p musl-generator --target x86_64-unknown-linux-musl
+    cargo run -p newlib-generator
+
+    # test that the functions don't contain invocations of `panic!`
+    case $TARGET in
+        armv7-unknown-linux-gnueabihf)
+            cross build --release --target $TARGET --example no-panic
+            ;;
+    esac
+
     # run unit tests
     cross test --lib --features checked --target $TARGET --release
 
-    # generate tests
-    cargo run --package test-generator --target x86_64-unknown-linux-musl
-
     # run generated tests
     cross test --tests --features checked --target $TARGET --release
 

test-generator/Cargo.toml renamed to input-generator/Cargo.toml

@@ -1,9 +1,7 @@
 [package]
-name = "test-generator"
+name = "input-generator"
 version = "0.1.0"
 authors = ["Jorge Aparicio <[email protected]>"]
-publish = false
 
 [dependencies]
-rand = "0.5.3"
-itertools = "0.7.8"
+rand = "0.5.4"

input-generator/src/main.rs

@@ -0,0 +1,189 @@
+extern crate rand;
+
+use std::collections::BTreeSet;
+use std::error::Error;
+use std::fs::{self, File};
+use std::io::Write;
+
+use rand::{RngCore, SeedableRng, XorShiftRng};
+
+const NTESTS: usize = 10_000;
+
+fn main() -> Result<(), Box<Error>> {
+    let mut rng = XorShiftRng::from_rng(&mut rand::thread_rng())?;
+
+    fs::remove_dir_all("bin").ok();
+    fs::create_dir_all("bin/input")?;
+    fs::create_dir_all("bin/output")?;
+
+    f32(&mut rng)?;
+    f32f32(&mut rng)?;
+    f32f32f32(&mut rng)?;
+    f32i16(&mut rng)?;
+    f64(&mut rng)?;
+    f64f64(&mut rng)?;
+    f64f64f64(&mut rng)?;
+    f64i16(&mut rng)?;
+
+    Ok(())
+}
+
+fn f32(rng: &mut XorShiftRng) -> Result<(), Box<Error>> {
+    let mut set = BTreeSet::new();
+
+    while set.len() < NTESTS {
+        let f = f32::from_bits(rng.next_u32());
+
+        if f.is_nan() {
+            continue;
+        }
+
+        set.insert(f.to_bits());
+    }
+
+    let mut f = File::create("bin/input/f32")?;
+    for i in set {
+        f.write_all(&i.to_bytes())?;
+    }
+
+    Ok(())
+}
+
+fn f32f32(rng: &mut XorShiftRng) -> Result<(), Box<Error>> {
+    let mut f = File::create("bin/input/f32f32")?;
+    let mut i = 0;
+    while i < NTESTS {
+        let x0 = f32::from_bits(rng.next_u32());
+        let x1 = f32::from_bits(rng.next_u32());
+
+        if x0.is_nan() || x1.is_nan() {
+            continue;
+        }
+
+        i += 1;
+        f.write_all(&x0.to_bits().to_bytes())?;
+        f.write_all(&x1.to_bits().to_bytes())?;
+    }
+
+    Ok(())
+}
+
+fn f32i16(rng: &mut XorShiftRng) -> Result<(), Box<Error>> {
+    let mut f = File::create("bin/input/f32i16")?;
+    let mut i = 0;
+    while i < NTESTS {
+        let x0 = f32::from_bits(rng.next_u32());
+        let x1 = rng.next_u32() as i16;
+
+        if x0.is_nan() {
+            continue;
+        }
+
+        i += 1;
+        f.write_all(&x0.to_bits().to_bytes())?;
+        f.write_all(&x1.to_bytes())?;
+    }
+
+    Ok(())
+}
+
+fn f32f32f32(rng: &mut XorShiftRng) -> Result<(), Box<Error>> {
+    let mut f = File::create("bin/input/f32f32f32")?;
+    let mut i = 0;
+    while i < NTESTS {
+        let x0 = f32::from_bits(rng.next_u32());
+        let x1 = f32::from_bits(rng.next_u32());
+        let x2 = f32::from_bits(rng.next_u32());
+
+        if x0.is_nan() || x1.is_nan() || x2.is_nan() {
+            continue;
+        }
+
+        i += 1;
+        f.write_all(&x0.to_bits().to_bytes())?;
+        f.write_all(&x1.to_bits().to_bytes())?;
+        f.write_all(&x2.to_bits().to_bytes())?;
+    }
+
+    Ok(())
+}
+
+fn f64(rng: &mut XorShiftRng) -> Result<(), Box<Error>> {
+    let mut set = BTreeSet::new();
+
+    while set.len() < NTESTS {
+        let f = f64::from_bits(rng.next_u64());
+
+        if f.is_nan() {
+            continue;
+        }
+
+        set.insert(f.to_bits());
+    }
+
+    let mut f = File::create("bin/input/f64")?;
+    for i in set {
+        f.write_all(&i.to_bytes())?;
+    }
+
+    Ok(())
+}
+
+fn f64f64(rng: &mut XorShiftRng) -> Result<(), Box<Error>> {
+    let mut f = File::create("bin/input/f64f64")?;
+    let mut i = 0;
+    while i < NTESTS {
+        let x0 = f64::from_bits(rng.next_u64());
+        let x1 = f64::from_bits(rng.next_u64());
+
+        if x0.is_nan() || x1.is_nan() {
+            continue;
+        }
+
+        i += 1;
+        f.write_all(&x0.to_bits().to_bytes())?;
+        f.write_all(&x1.to_bits().to_bytes())?;
+    }
+
+    Ok(())
+}
+
+fn f64f64f64(rng: &mut XorShiftRng) -> Result<(), Box<Error>> {
+    let mut f = File::create("bin/input/f64f64f64")?;
+    let mut i = 0;
+    while i < NTESTS {
+        let x0 = f64::from_bits(rng.next_u64());
+        let x1 = f64::from_bits(rng.next_u64());
+        let x2 = f64::from_bits(rng.next_u64());
+
+        if x0.is_nan() || x1.is_nan() || x2.is_nan() {
+            continue;
+        }
+
+        i += 1;
+        f.write_all(&x0.to_bits().to_bytes())?;
+        f.write_all(&x1.to_bits().to_bytes())?;
+        f.write_all(&x2.to_bits().to_bytes())?;
+    }
+
+    Ok(())
+}
+
+fn f64i16(rng: &mut XorShiftRng) -> Result<(), Box<Error>> {
+    let mut f = File::create("bin/input/f64i16")?;
+    let mut i = 0;
+    while i < NTESTS {
+        let x0 = f64::from_bits(rng.next_u64());
+        let x1 = rng.next_u32() as i16;
+
+        if x0.is_nan() {
+            continue;
+        }
+
+        i += 1;
+        f.write_all(&x0.to_bits().to_bytes())?;
+        f.write_all(&x1.to_bytes())?;
+    }
+
+    Ok(())
+}

math/.cargo/config

@@ -0,0 +1,11 @@
+[target.thumbv7em-none-eabi]
+rustflags = [
+  "-C", "link-arg=-Wl,-Tlink.x",
+  "-C", "link-arg=-nostartfiles",
+  "-C", "link-arg=-mthumb",
+  "-C", "link-arg=-march=armv7e-m",
+  "-C", "link-arg=-mfloat-abi=soft",
+]
+
+[build]
+target = "thumbv7em-none-eabi"

math/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "math"
+version = "0.0.0"
+
+[dependencies]
+qemu-arm-rt = { git = "https://github.com/japaric/qemu-arm-rt" }
+
+[workspace]

math/Cross.toml

@@ -0,0 +1,2 @@
+[target.thumbv7em-none-eabi]
+xargo = false

musl-generator/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "musl-generator"
+version = "0.1.0"
+authors = ["Jorge Aparicio <[email protected]>"]
+
+[dependencies]
+lazy_static = "1.0.2"
+shared = { path = "../shared" }
+libm = { path = ".." }