diff --git a/RUNNING.md b/RUNNING.md index 1248f04..2b8827e 100644 --- a/RUNNING.md +++ b/RUNNING.md @@ -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 -- \ @@ -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 -- \ @@ -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 @@ -40,8 +40,8 @@ 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 -- \ @@ -49,8 +49,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/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 -- \ @@ -58,8 +58,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/5x5_x_5x5-mmult.v \ --output ./hdl-benchmarks/processed-netlists/5x5_x_5x5-mmult-arith.v \ --arithmetic @@ -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 -- \ @@ -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 -- \ @@ -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 @@ -107,32 +107,32 @@ ## 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`. @@ -140,39 +140,39 @@ ## 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 -- \ @@ -186,8 +186,8 @@ 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 -- \ @@ -195,24 +195,24 @@ ``` 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 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. @@ -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 @@ -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 diff --git a/src/lib.rs b/src/lib.rs index 0aa602c..d16532c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -115,8 +115,6 @@ pub fn get_input_wire_map( wire_inputs: Vec>, arithmetic_type: &str, ) -> HashMap { - dbg!("input_wires: {:?}", &wire_inputs); - if let Some(wire_file_name) = &inputs_filename { println!( "{}[✓]{} Input wires were provided.", @@ -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::().unwrap(); @@ -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)); }