Compile-batch-matmul-to-glenside

.github/workflows/build-and-test.yml

@@ -2,17 +2,25 @@ name: Build and test
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 3la-pldi-push-main ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, 3la-pldi-push-main ]
 
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
+      - name: Start ssh-agent
+        uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.SSH_KEY }}
       - uses: actions/checkout@v2
-      - run: docker build --tag glenside .
+      - run: DOCKER_BUILDKIT=1 docker build --ssh default --tag glenside .
       # TODO(@gussmith23) Keep the list of features up to date
       # TODO(@gussmith23) Can't test CPLEX in Github Actions
       # TODO(@gussmith23) Can we optionally build the Docker w/ access to CPLEX?
-      - run: docker run glenside cargo test --no-default-features --features "run-on-github-actions tvm"
+      # For 3la pldi push, we don't need GH actions flag, as we disabled the
+      # tests which use it.
+      # TODO(@gussmith23) The GH actions flag can be removed entirely; just
+      # count egg iterations, not time
+      - run: docker run glenside cargo test --no-default-features --features "tvm"

.github/workflows/rustfmt.yml

@@ -2,9 +2,9 @@ name: Check formatting
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 3la-pldi-push-main ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, 3la-pldi-push-main ]
 
 jobs:
   check-formatting:

.gitignore

@@ -13,3 +13,5 @@ Cargo.lock
 #Added by cargo
 
 /target
+
+*.json

Cargo.toml

@@ -47,18 +47,23 @@ git = "https://github.com/gussmith23/rplex"
 # issue.
 # NOTE Keep glenside-evaluation in sync with this
 # If the versions get out of whack, we'll probably have some weird errors.
-rev = "4ed759f6b6cafbab707f95b57762913a1f57c021"
-git = "https://github.com/hypercubestart/incubator-tvm"
+# rev = "4ed759f6b6cafbab707f95b57762913a1f57c021"
+# git = "https://github.com/hypercubestart/incubator-tvm"
+git = "ssh://[email protected]/uwsampl/3la-tvm.git"
+# branch = "3la-pldi-push-main"
+rev = "8185bdfe61ef3e5579867393eb52669bb8daebb2"
 optional = true
 
 [dependencies.egg]
-rev = "39415f19acdacd6dde62f40cb2bb08f8669acc85"
-git = "https://github.com/mwillsey/egg"
+# rev = "39415f19acdacd6dde62f40cb2bb08f8669acc85"
+git = "https://github.com/AD1024/egg"
+rev = "b8f902f554cc476c397e4fd9c7bea229f946d2a9"
+features = ["serde-json"]
 
 [dependencies.ndarray]
 version = "0.13.0"
 features = ["approx"]
 
 [dependencies.serde]
 version = "1.0"
-features = ["derive"]
+features = ["derive"]

Dockerfile

@@ -9,7 +9,7 @@ FROM ubuntu:18.04
 # https://stackoverflow.com/questions/44331836/apt-get-install-tzdata-noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update
-RUN apt install -y git libgtest-dev cmake wget unzip libtinfo-dev libz-dev libcurl4-openssl-dev libopenblas-dev g++ sudo python3-dev libclang-dev curl lsb-release wget software-properties-common python3-pip
+RUN apt install -y git libgtest-dev cmake wget unzip libtinfo-dev libz-dev libcurl4-openssl-dev libopenblas-dev g++ sudo python3-dev libclang-dev curl lsb-release wget software-properties-common python3-pip libssl-dev pkg-config
 
 # Install Rust
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
@@ -26,12 +26,13 @@ RUN sudo ./llvm.sh 10
 ENV LLVM_CONFIG_PATH=/usr/lib/llvm-10/bin/llvm-config
 
 # Build TVM with Rust bindings
-# TODO(@gussmith23) Switch this to TVM mainline
-# once https://github.com/apache/incubator-tvm/pull/6563 is merged
-RUN cd /root && git clone https://github.com/hypercubestart/incubator-tvm tvm --recursive
+WORKDIR /root/.ssh
+RUN ssh-keyscan github.com >> ~/.ssh/known_hosts
+WORKDIR /root
+RUN --mount=type=ssh git clone --recursive [email protected]:uwsampl/3la-tvm.git tvm
 WORKDIR /root/tvm
-RUN git fetch
-RUN git checkout 4ed759f6b6cafbab707f95b57762913a1f57c021
+RUN --mount=type=ssh git fetch
+RUN git checkout bb6c378e5440899083af253c3466db087157acb6
 RUN git submodule sync && git submodule update
 RUN echo 'set(USE_LLVM $ENV{LLVM_CONFIG_PATH})' >> config.cmake
 RUN echo 'set(USE_RPC ON)' >> config.cmake
@@ -59,9 +60,7 @@ RUN pip3 install --upgrade pip
 COPY ./requirements.txt ./requirements.txt
 RUN pip3 install -r requirements.txt
 
-# Build Glenside with all features
+# Build Glenside.
 WORKDIR /root/glenside
 COPY . .
-
-# At this point, you should be able to build Glenside with whatever features you
-# want!
+RUN --mount=type=ssh cargo build --no-default-features --features "tvm"

examples/glenside-cli.rs

@@ -477,6 +477,7 @@ fn main() {
 
         let mut egraph = EGraph::new(MyAnalysis {
             name_to_shape: shapes_map.clone(),
+            name_to_dtype: HashMap::default(),
         });
         let id = egraph.add_expr(&glenside_expr);
 
@@ -604,6 +605,7 @@ fn main() {
 
         let mut egraph = EGraph::new(MyAnalysis {
             name_to_shape: shapes_map,
+            name_to_dtype: HashMap::default(),
         });
         let id = egraph.add_expr(&extracted_expr);
         let (hw_id_map, hw_atoms) = if let Some(val) = matches.value_of("find-monolithic-designs") {