Skip to content

Commit

Permalink
Update RUNNING.md and remove forgotten print
Browse files Browse the repository at this point in the history
  • Loading branch information
jimouris committed Sep 17, 2023
1 parent e0bf4e5 commit ceaf05a
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 63 deletions.
116 changes: 58 additions & 58 deletions RUNNING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
1. **16-bit**
1. **Gates**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/16-bit-mult-gates.v \
--output ./hdl-benchmarks/processed-netlists/16-bit-mult-gates.v
cargo run --bin helm --release -- \
Expand All @@ -14,8 +14,8 @@
```
2. **LUT w/ LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/16-bit-mult-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/16-bit-mult-lut-2-1.v
cargo run --bin helm --release -- \
Expand All @@ -24,11 +24,11 @@
```
3. **LUT w/o LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/designs/16-bit-mult.v \
--output ./hdl-benchmarks/processed-netlists/16-bit-mult-arith.v \
--arithmetic
--arithmetic
cargo run --bin helm --release -- --arithmetic u16 \
--verilog ./hdl-benchmarks/processed-netlists/16-bit-mult-arith.v \
-w G11 99 16 -w G12 4 16
Expand All @@ -40,26 +40,26 @@
1. **5x5 x 5x5**
1. **Gates**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/5x5_x_5x5_mmult_gates.v \
--output ./hdl-benchmarks/processed-netlists/5x5_x_5x5_mmult_gates.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/5x5_x_5x5_mmult_gates.v
```
2. **LUT w/ LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/5x5_x_5x5_mmult-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/5x5_x_5x5_mmult-lut-2-1.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/5x5_x_5x5_mmult-lut-2-1.v
```
3. **LUT w/o LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/designs/5x5_x_5x5-mmult.v \
--output ./hdl-benchmarks/processed-netlists/5x5_x_5x5-mmult-arith.v \
--arithmetic
Expand All @@ -73,8 +73,8 @@
## 3. Chi squared
1. **Gates**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/chi_squared_gates.v \
--output ./hdl-benchmarks/processed-netlists/chi_squared_gates.v
cargo run --bin helm --release -- \
Expand All @@ -83,8 +83,8 @@
```
2. **LUT w/ LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/chi_squared-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/chi_squared-lut-2-1.v
cargo run --bin helm --release -- \
Expand All @@ -93,8 +93,8 @@
```
3. **LUT w/o LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/designs/chi_squared.v \
--output ./hdl-benchmarks/processed-netlists/chi_squared_arith.v \
--arithmetic
Expand All @@ -107,72 +107,72 @@
## 4. Euclidean Distance
1. `n = 32` Gates
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/v32_euclidean_gates.v \
--output ./hdl-benchmarks/processed-netlists/v32_euclidean_gates.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/v32_euclidean_gates.v
--verilog ./hdl-benchmarks/processed-netlists/v32_euclidean_gates.v
```
3. `n = 32` 2:1 LUT w/ LBB
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/v32_euclidean-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/v32_euclidean-lut-2-1.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/v32_euclidean-lut-2-1.v
--verilog ./hdl-benchmarks/processed-netlists/v32_euclidean-lut-2-1.v
```
4. `n = 32` LUT w/o LBB
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/designs/v32-euclidean-distance.v \
--output ./hdl-benchmarks/processed-netlists/v32_euclidean-arith.v \
--arithmetic
cargo run --bin helm --release -- \
--arithmetic u32
--verilog ./hdl-benchmarks/processed-netlists/v32_euclidean-arith.v
--arithmetic u32 \
--verilog ./hdl-benchmarks/processed-netlists/v32_euclidean-arith.v
```
5. Support for `n = 64`.


## 5. CRC-32
1. **Gates**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/crc-32-gates.v \
--output ./hdl-benchmarks/processed-netlists/crc-32-gates.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/crc-32-gates.v
--verilog ./hdl-benchmarks/processed-netlists/crc-32-gates.v
```
2. **LUT w/ LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/crc32-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/crc32-lut-2-1.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/crc32-lut-2-1.v
--verilog ./hdl-benchmarks/processed-netlists/crc32-lut-2-1.v
```

## 6. AES
1. **AES Core**
1. **Gates**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/aes_core_gates.v \
--output ./hdl-benchmarks/processed-netlists/aes_core_gates.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/aes_core_gates.v \
--input-wires-file ./hdl-benchmarks/test-cases/aes.inputs.csv
--input-wires-file ./hdl-benchmarks/test-cases/aes.inputs.csv
```
2. **LUT w/ LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/aes-core-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/aes-core-lut-2-1.v
cargo run --bin helm --release -- \
Expand All @@ -186,33 +186,33 @@
1. **Gaussian Blur**
1. **Gates**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/r45-c66-gaussian-blur-gates.v \
--output ./hdl-benchmarks/processed-netlists/r45-c66-gaussian-blur-gates.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/r45-c66-gaussian-blur-gates.v
```
2. **LUT w/ LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/r45-c66-gaussian-blur-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/r45-c66-gaussian-blur-gates.v
--output ./hdl-benchmarks/processed-netlists/r45-c66-gaussian-blur-lut-2-1.v
cargo run --bin helm --release -- \
--verilog ./hdl-benchmarks/processed-netlists/r45-c66-gaussian-blur-lut-2-1.v
--verilog ./hdl-benchmarks/processed-netlists/r45-c66-gaussian-blur-lut-2-1.v
```
3. **LUT w/o LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/designs/r45_c66-blur.v \
--output ./hdl-benchmarks/processed-netlists/r45-c66-gaussian-blur-arith.v \
--arithmetic
cargo run --bin helm --release -- \
--arithmetic u8
--arithmetic u8 \
--verilog ./hdl-benchmarks/processed-netlists/r45-c66-gaussian-blur-arith.v \
--input-wires-file ./hdl-benchmarks/test-cases/r45-c66-gaussian-blur.inputs.csv
--input-wires-file ./hdl-benchmarks/test-cases/r45-c66-gaussian-blur.inputs.csv
```
2. Support for Gaussian Blur.

Expand All @@ -221,16 +221,16 @@
1. **c1355**
1. **Gates**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/c1355.v \
--output ./hdl-benchmarks/processed-netlists/c1355.v
cargo run --bin helm --release -- --verilog ./hdl-benchmarks/processed-netlists/c1355.v
```
2. **LUT w/ LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/c1355-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/c1355-lut-2-1.v
cargo run --bin helm --release -- --verilog ./hdl-benchmarks/processed-netlists/c1355-lut-2-1.v
Expand All @@ -242,16 +242,16 @@
1. **s386**
1. **Gates**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/s386.v \
--output ./hdl-benchmarks/processed-netlists/s386.v
cargo run --bin helm --release -- --verilog ./hdl-benchmarks/processed-netlists/s386.v --cycles 1
```
2. **LUT w/ LBB**
```shell
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
cargo run --bin preprocessor --release \
--manifest-path=./hdl-benchmarks/Cargo.toml -- \
--input ./hdl-benchmarks/netlists/s386-lut-2-1.v \
--output ./hdl-benchmarks/processed-netlists/s386-lut-2-1.v
cargo run --bin helm --release -- --verilog ./hdl-benchmarks/processed-netlists/s386-lut-2-1.v --cycles 1
Expand Down
5 changes: 0 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ pub fn get_input_wire_map(
wire_inputs: Vec<Vec<&String>>,
arithmetic_type: &str,
) -> HashMap<String, PtxtType> {
dbg!("input_wires: {:?}", &wire_inputs);

if let Some(wire_file_name) = &inputs_filename {
println!(
"{}[✓]{} Input wires were provided.",
Expand All @@ -139,8 +137,6 @@ pub fn get_input_wire_map(
let wire_name = parts[0].to_string();
if parts.len() == 2 {
let wire_value = parse_input_wire(parts[1], arithmetic_type);
println!("(wire_name, wire_value): {:?} {:?}", wire_name, wire_value);

vec![(wire_name, wire_value)]
} else if parts.len() == 3 && arithmetic_type == "bool" {
let wire_width = parts[2].trim().parse::<usize>().unwrap();
Expand All @@ -158,7 +154,6 @@ pub fn get_input_wire_map(
} else {
PtxtType::Bool(false)
};
println!("(wire_name, wire_value): {:?} {:?}", key, value);

pairs.push((key, value));
}
Expand Down

0 comments on commit ceaf05a

Please sign in to comment.