Add byods data structure providers under byods/rels-ascent

.github/workflows/rust.yml

@@ -66,6 +66,19 @@ jobs:
       working-directory: ./ascent_macro
       run: cargo test test  
 
+  byods-rels:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+
+      - name: cargo test
+        working-directory: ./byods/rels-ascent
+        run: cargo test
+
   dependency-check:
     runs-on: ubuntu-latest
 

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
 members = ["ascent", "ascent_base", "ascent_macro"] 
-exclude = ["ascent_tests", "wasm-tests"]
+exclude = ["ascent_tests", "wasm-tests", "byods"]

byods/README.md

@@ -0,0 +1,3 @@
+This directory contains custom data structure providers for Ascent's ["Bring Your Own Data Strcutures"](https://dl.acm.org/doi/10.1145/3622840) feature.
+
+To get started with custom data structures in Ascent, see the example in `./rels-ascent/examples/steensgaard`.

byods/rels-ascent/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "rels-ascent"
+version = "0.1.0"
+edition = "2021"
+
+[dev-dependencies]
+proptest = "1"
+rand = "0.8"
+serde = "1.0.193"
+csv = "1"
+separator = "0.4.1"
+
+
+[dependencies]
+ascent = { path = "../../ascent", version = "0.5.0" }
+itertools = "0.12"
+rustc-hash = "1.1"
+derive_more = "0.99"
+paste = "1.0"
+hashbrown = { version = "0.14", features = ["raw", "rayon"] }
+
+[features]
+compact = []

byods/rels-ascent/examples/steensgaard/main.rs

@@ -0,0 +1,146 @@
+use std::alloc::System;
+
+use ascent::ascent;
+use ascent::internal::Instant;
+use itertools::Itertools;
+
+use rels_ascent::tracking_alloc::{self, TrackingAllocator};
+
+#[global_allocator]
+static GLOBAL: TrackingAllocator<System> = TrackingAllocator(System);
+
+type Symbol = &'static str;
+
+ascent! {
+   #![measure_rule_times]
+   /// Steensgaard analysis using `eqrel`
+   struct Steensgaard;
+
+   relation alloc(Symbol, Symbol);
+   // x := y;
+   relation assign(Symbol, Symbol);
+   // x := y.f;
+   relation load(Symbol, Symbol, Symbol);
+   // x.f := y;
+   relation store(Symbol, Symbol, Symbol);
+
+   #[ds(rels_ascent::eqrel)]
+   relation vpt(Symbol, Symbol);
+
+   // assignments
+   vpt(x,y) <--
+   assign(x,y);
+
+   // allocation sites
+   vpt(x,y) <--
+   alloc(x,y);
+
+   // load/store pairs
+   vpt(y,p) <--
+   store(x,f, y),
+   load(p,q,f),
+   vpt(x,q);
+}
+
+ascent! {
+   #![measure_rule_times]
+   /// Explicit Steensgaard analysis
+   struct SteensgaardExplicit;
+
+   relation alloc(Symbol, Symbol);
+   // x := y;
+   relation assign(Symbol, Symbol);
+   // x := y.f;
+   relation load(Symbol, Symbol, Symbol);
+   // x.f := y;
+   relation store(Symbol, Symbol, Symbol);
+
+   relation vpt(Symbol, Symbol);
+
+   vpt(y, x), vpt(x, x) <-- vpt(x, y);
+   vpt(x, z) <-- vpt(x, y), vpt(y, z);
+
+   // assignments
+   vpt(x,y) <--
+   assign(x,y);
+
+   // allocation sites
+   vpt(x,y) <--
+   alloc(x,y);
+
+   // load/store pairs
+   vpt(y,p) <--
+   store(x,f, y),
+   load(p,q,f),
+   vpt(x,q);
+}
+
+fn read_csv<T>(path: &str) -> impl Iterator<Item = T>
+where
+   for<'de> T: serde::de::Deserialize<'de>,
+{
+   csv::ReaderBuilder::new()
+      .delimiter(b'\t')
+      .has_headers(false)
+      .double_quote(false)
+      .quoting(false)
+      .from_path(path)
+      .unwrap()
+      .into_deserialize()
+      .map(|x| x.unwrap())
+}
+
+fn main() {
+   let path = "./examples/steensgaard/openjdk_javalang_steensgaard/";
+   let get_path = |x: &str| format!("{path}{x}");
+
+   println!("Running eqrel version.");
+   let mem_use_before = tracking_alloc::current_alloc();
+   let start_time = Instant::now();
+   let mut prog = Steensgaard::default();
+
+   prog.alloc =
+      read_csv::<(String, String)>(&get_path("alloc.facts")).map(|(x, y)| (x.leak() as _, y.leak() as _)).collect_vec();
+   prog.assign = read_csv::<(String, String)>(&get_path("assign.facts"))
+      .map(|(x, y)| (x.leak() as _, y.leak() as _))
+      .collect_vec();
+   prog.load = read_csv::<(String, String, String)>(&get_path("load.facts"))
+      .map(|(x, y, z)| (x.leak() as _, y.leak() as _, z.leak() as _))
+      .collect_vec();
+   prog.store = read_csv::<(String, String, String)>(&get_path("store.facts"))
+      .map(|(x, y, z)| (x.leak() as _, y.leak() as _, z.leak() as _))
+      .collect_vec();
+
+   prog.run();
+
+   println!("mem use: {:.2} Mib", (tracking_alloc::max_alloc() - mem_use_before) as f64 / 2f64.powi(20));
+   println!("everything took: {:?}", start_time.elapsed());
+   println!("vpt size: {}", prog.__vpt_ind_common.count_exact());
+
+   tracking_alloc::reset_max_alloc();
+
+   // Explicit version:
+   println!("");
+   println!("Running Explicit version. This will take FOREVER!");
+   let mem_use_before = tracking_alloc::current_alloc();
+   let start_time = Instant::now();
+   let mut prog = SteensgaardExplicit::default();
+
+   prog.alloc =
+      read_csv::<(String, String)>(&get_path("alloc.facts")).map(|(x, y)| (x.leak() as _, y.leak() as _)).collect_vec();
+   prog.assign = read_csv::<(String, String)>(&get_path("assign.facts"))
+      .map(|(x, y)| (x.leak() as _, y.leak() as _))
+      .collect_vec();
+   prog.load = read_csv::<(String, String, String)>(&get_path("load.facts"))
+      .map(|(x, y, z)| (x.leak() as _, y.leak() as _, z.leak() as _))
+      .collect_vec();
+   prog.store = read_csv::<(String, String, String)>(&get_path("store.facts"))
+      .map(|(x, y, z)| (x.leak() as _, y.leak() as _, z.leak() as _))
+      .collect_vec();
+
+   prog.run();
+
+   println!("mem use: {:.2} Mib", (tracking_alloc::max_alloc() - mem_use_before) as f64 / 2f64.powi(20));
+   println!("everything took: {:?}", start_time.elapsed());
+   println!("vpt size: {}", prog.vpt.len());
+}