Merge branch 'main' into update_csharp

Author: danmoseley

.github/odin.sh

@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-VERSION=dev-2023-05
+VERSION=dev-2024-01
 FILE_NAME=odin-ubuntu-amd64-$VERSION.zip
 sudo apt-get install -y aria2
 mkdir /tmp/odin

bench/algorithm/json-serde/4-i.rs

@@ -0,0 +1,70 @@
+use serde::{Deserialize, Serialize, Serializer};
+use std::fs;
+
+fn main() -> anyhow::Result<()> {
+    let file_name = std::env::args_os()
+        .nth(1)
+        .and_then(|s| s.into_string().ok())
+        .unwrap_or("sample".to_string());
+    let n = std::env::args_os()
+        .nth(2)
+        .and_then(|s| s.into_string().ok())
+        .and_then(|s| s.parse().ok())
+        .unwrap_or(10);
+    let mut json_str = fs::read(format!("{}.json", file_name))?;
+    let json: GeoData = simd_json::from_slice(&mut json_str)?;
+
+    print_hash(simd_json::to_vec(&json)?);
+    let mut array = Vec::with_capacity(n);
+    for _i in 0..n {
+        let json: GeoData = simd_json::from_slice(&mut json_str)?;
+        array.push(json);
+    }
+    print_hash(simd_json::to_vec(&array)?);
+    Ok(())
+}
+
+fn print_hash(bytes: impl AsRef<[u8]>) {
+    let digest = md5::compute(&bytes);
+    println!("{:x}", digest);
+}
+
+#[derive(Deserialize, Debug, Default)]
+struct MyF64(f64);
+
+impl Serialize for MyF64 {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        if self.0.fract() == 0.0 {
+            serializer.serialize_i64(self.0 as i64)
+        } else {
+            serializer.serialize_f64(self.0)
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Debug, Default)]
+struct GeoData {
+    r#type: String,
+    features: Vec<Feature>,
+}
+
+#[derive(Deserialize, Serialize, Debug, Default)]
+struct Feature {
+    r#type: String,
+    properties: Properties,
+    geometry: Geometry,
+}
+
+#[derive(Deserialize, Serialize, Debug, Default)]
+struct Properties {
+    name: String,
+}
+
+#[derive(Deserialize, Serialize, Debug, Default)]
+struct Geometry {
+    r#type: String,
+    coordinates: Vec<Vec<[MyF64; 2]>>,
+}

bench/algorithm/json-serde/5-i.rs

@@ -0,0 +1,70 @@
+use serde::{Deserialize, Serialize, Serializer};
+use std::fs;
+
+fn main() -> anyhow::Result<()> {
+    let file_name = std::env::args_os()
+        .nth(1)
+        .and_then(|s| s.into_string().ok())
+        .unwrap_or("sample".to_string());
+    let n = std::env::args_os()
+        .nth(2)
+        .and_then(|s| s.into_string().ok())
+        .and_then(|s| s.parse().ok())
+        .unwrap_or(10);
+    let mut json_str = fs::read(format!("{}.json", file_name))?;
+    let json: GeoData = sonic_rs::from_slice(&mut json_str)?;
+
+    print_hash(sonic_rs::to_vec(&json)?);
+    let mut array = Vec::with_capacity(n);
+    for _i in 0..n {
+        let json: GeoData = sonic_rs::from_slice(&mut json_str)?;
+        array.push(json);
+    }
+    print_hash(sonic_rs::to_vec(&array)?);
+    Ok(())
+}
+
+fn print_hash(bytes: impl AsRef<[u8]>) {
+    let digest = md5::compute(&bytes);
+    println!("{:x}", digest);
+}
+
+#[derive(Deserialize, Debug, Default)]
+struct MyF64(f64);
+
+impl Serialize for MyF64 {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        if self.0.fract() == 0.0 {
+            serializer.serialize_i64(self.0 as i64)
+        } else {
+            serializer.serialize_f64(self.0)
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Debug, Default)]
+struct GeoData {
+    r#type: String,
+    features: Vec<Feature>,
+}
+
+#[derive(Deserialize, Serialize, Debug, Default)]
+struct Feature {
+    r#type: String,
+    properties: Properties,
+    geometry: Geometry,
+}
+
+#[derive(Deserialize, Serialize, Debug, Default)]
+struct Properties {
+    name: String,
+}
+
+#[derive(Deserialize, Serialize, Debug, Default)]
+struct Geometry {
+    r#type: String,
+    coordinates: Vec<Vec<[MyF64; 2]>>,
+}

bench/algorithm/knucleotide/1.odin

@@ -102,7 +102,7 @@ read_lines_with_buffering :: proc() ->(string,io.Error){
    return "",io.Error(err)
  }
  defer os.close(f)
- bufio.reader_init_with_buf(&r, {os.stream_from_handle(f)}, buffer[:])
+ bufio.reader_init_with_buf(&r, os.stream_from_handle(f), buffer[:])
  defer bufio.reader_destroy(&r)
 
  linerc:strings.Builder;

bench/algorithm/mandelbrot/1.odin

@@ -1,6 +1,6 @@
 package main
 
-import "core:crypto/md5"
+import "core:crypto/legacy/md5"
 import "core:fmt"
 import "core:runtime"
 import "core:strconv"

bench/bench_odin.yaml

@@ -38,4 +38,4 @@ environments:
     build: odin build . -o:speed -disable-assert -no-bounds-check -microarch:broadwell -show-timings -out:out/app
     out_dir: out
     run_cmd: app
-    allow_failure: true
+    # allow_failure: true

bench/bench_ruby.yaml

@@ -71,7 +71,7 @@ environments:
   - os: linux
     compiler: truffleruby
     version: latest
-    docker: ghcr.io/graalvm/truffleruby
+    docker: ghcr.io/graalvm/truffleruby-community
     docker_runtime_dir: /opt/truffleruby-*
     docker_runtime_dir_rename_to: truffleruby
     include:

bench/bench_rust.yaml

@@ -59,6 +59,8 @@ problems:
       - 1.rs
       - 2.rs
       - 3.rs
+      - 4-i.rs
+      - 5-i.rs
   - name: coro-prime-sieve
     source:
       - 1.rs

bench/include/rust/Cargo.toml

@@ -42,6 +42,8 @@ rayon = "1"
 regex = "1"
 serde = {version = "1", features = ["derive"]}
 serde_json = {version = "1", features = ["float_roundtrip", "preserve_order"]}
+simd-json = "0.13"
+sonic-rs = "0.3"
 static-rc = "0"
 
 async-channel = {version = "2", optional = true}