Browse Source

Create a crate for converting Souper optimizations into Peepmatic DSL

This crate is currently empty but is hooked up to our CI, the cargo workspace,
our publish script, etc.
pull/2192/head
Nick Fitzgerald 4 years ago
parent
commit
443965b95d
  1. 7
      .github/workflows/main.yml
  2. 5
      Cargo.lock
  3. 3
      cranelift/Cargo.toml
  4. 11
      cranelift/peepmatic/crates/souper/Cargo.toml
  5. 1
      cranelift/peepmatic/crates/souper/src/lib.rs
  6. 1
      scripts/publish.rs

7
.github/workflows/main.yml

@ -162,7 +162,8 @@ jobs:
--package peepmatic-fuzzing \
--package peepmatic-macro \
--package peepmatic-runtime \
--package peepmatic-test
--package peepmatic-test \
--package peepmatic-souper
- name: Rebuild Peepmatic-based peephole optimizers and test them
run: |
cargo test \
@ -248,7 +249,8 @@ jobs:
--exclude peepmatic-fuzzing \
--exclude peepmatic-macro \
--exclude peepmatic-runtime \
--exclude peepmatic-test
--exclude peepmatic-test \
--exclude peepmatic-souper
env:
RUST_BACKTRACE: 1
@ -383,6 +385,7 @@ jobs:
--exclude peepmatic-macro \
--exclude peepmatic-runtime \
--exclude peepmatic-test \
--exclude peepmatic-souper \
--exclude wasmtime-fuzz
env:
RUST_BACKTRACE: 1

5
Cargo.lock

@ -564,6 +564,7 @@ dependencies = [
"filecheck",
"indicatif",
"log",
"peepmatic-souper",
"pretty_env_logger",
"target-lexicon",
"term",
@ -1326,6 +1327,10 @@ dependencies = [
"wast",
]
[[package]]
name = "peepmatic-souper"
version = "0.66.0"
[[package]]
name = "peepmatic-test"
version = "0.2.0"

3
cranelift/Cargo.toml

@ -36,6 +36,7 @@ term = "0.6.1"
capstone = { version = "0.6.0", optional = true }
wat = { version = "1.0.18", optional = true }
target-lexicon = "0.10"
peepmatic-souper = { path = "./peepmatic/crates/souper", version = "0.66.0", optional = true }
pretty_env_logger = "0.4.0"
file-per-thread-logger = "0.1.2"
indicatif = "0.13.0"
@ -43,7 +44,7 @@ thiserror = "1.0.15"
walkdir = "2.2"
[features]
default = ["disas", "wasm", "cranelift-codegen/all-arch"]
default = ["disas", "wasm", "cranelift-codegen/all-arch", "peepmatic-souper"]
disas = ["capstone"]
enable-peepmatic = ["cranelift-codegen/enable-peepmatic", "cranelift-filetests/enable-peepmatic"]
wasm = ["wat", "cranelift-wasm"]

11
cranelift/peepmatic/crates/souper/Cargo.toml

@ -0,0 +1,11 @@
[package]
name = "peepmatic-souper"
version = "0.66.0"
authors = ["Nick Fitzgerald <fitzgen@gmail.com>"]
edition = "2018"
license = "Apache-2.0 WITH LLVM-exception"
description = "Converting Souper optimizations into Peepmatic DSL"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]

1
cranelift/peepmatic/crates/souper/src/lib.rs

@ -0,0 +1 @@
//! Converting Souper optimizations into Peepmatic DSL.

1
scripts/publish.rs

@ -22,6 +22,7 @@ const CRATES_TO_PUBLISH: &[&str] = &[
"peepmatic-test-operator",
"peepmatic-runtime",
"peepmatic",
"peepmatic-souper",
// cranelift
"cranelift-entity",
"cranelift-bforest",

Loading…
Cancel
Save