Rename evm directory to evm-engines, update README and Makefile

ewasm · Aug 15, 2020 · 437aa2d · 437aa2d
1 parent f1ed847
commit 437aa2d
Show file tree

Hide file tree

Showing 43 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
 all: build_docker_images benchmark notebook
 
 build_evm_engines:
-	cd evm/geth && docker build . -t ewasm/geth-bench:1
-	cd evm/parity && docker build . -t ewasm/parity-bench:1
-	cd evm/evmone && docker build . -t ewasm/evmone-bench:1
-	cd evm/cita-vm && docker build . -t ewasm/cita-vm-bench:1
-	cd evm/evmone-evm384 && docker build . -t ewasm/evmone-evm384-bench:1
+	cd evm-engines/geth && docker build . -t ewasm/geth-bench:1
+	cd evm-engines/parity && docker build . -t ewasm/parity-bench:1
+	cd evm-engines/evmone && docker build . -t ewasm/evmone-bench:1
+	cd evm-engines/cita-vm && docker build . -t ewasm/cita-vm-bench:1
+	cd evm-engines/evmone-evm384 && docker build . -t ewasm/evmone-evm384-bench:1
 
 build_wasm_engines:
 	cd wasm-engines && ./build_engines.sh
@@ -16,7 +16,7 @@ build_scout_engines:
 build_docker_images: build_evm_engines build_wasm_engines build_scout_engines
 
 benchmark_evm_engines:
-	cd evm && \
+	cd evm-engines && \
 	./scripts/run_bench.sh
 
 benchmark_scout_engines:

diff --git a/README.md b/README.md
@@ -3,18 +3,18 @@
 This repository contains instructions for benchmarking evm implementations, ewasm contracts and standalone wasm modules. Directory descriptions follow.
 
 ```
-evm/            - contains benchmarks for different evm implementations (geth, parity, cita-vm, evmone)
+evm-engines/    - contains benchmarks for different evm implementations (geth, parity, cita-vm, evmone)
 ewasm/          - contains benchmarks and tests for ewasm contracts in ewasm engines.
 wasm/           - contains benchmarks for wasm modules in standalone wasm engines.
 wasm-engines/   - contains benchmarks for wasm modules comparing wasm engines.
 ```
 
 ## EVM
 
-Directory `/evm` contains a list of the current benchmarked evm implementations:
+Directory `/evm-engines` contains a list of the current benchmarked evm implementations:
 
 ```
-evm/
+evm-engines/
   cita-vm/
   evmone/
   geth/

diff --git a/evm/cita-vm/Dockerfile → evm-engines/cita-vm/Dockerfile b/evm/cita-vm/Dockerfile → evm-engines/cita-vm/Dockerfile
diff --git a/evm/evmone-evm384/Dockerfile → evm-engines/evmone-evm384/Dockerfile b/evm/evmone-evm384/Dockerfile → evm-engines/evmone-evm384/Dockerfile
diff --git a/evm/evmone/Dockerfile → evm-engines/evmone/Dockerfile b/evm/evmone/Dockerfile → evm-engines/evmone/Dockerfile
diff --git a/evm/evmraceresults/evm_benchmarks.csv → ...engines/evmraceresults/evm_benchmarks.csv b/evm/evmraceresults/evm_benchmarks.csv → ...engines/evmraceresults/evm_benchmarks.csv
diff --git a/...evmraceresults/evm_benchmarks_cita-vm.csv → ...evmraceresults/evm_benchmarks_cita-vm.csv b/...evmraceresults/evm_benchmarks_cita-vm.csv → ...evmraceresults/evm_benchmarks_cita-vm.csv
diff --git a/evm/evmraceresults/evm_benchmarks_evmone.csv → .../evmraceresults/evm_benchmarks_evmone.csv b/evm/evmraceresults/evm_benchmarks_evmone.csv → .../evmraceresults/evm_benchmarks_evmone.csv
diff --git a/evm/evmraceresults/evm_benchmarks_geth.csv → ...es/evmraceresults/evm_benchmarks_geth.csv b/evm/evmraceresults/evm_benchmarks_geth.csv → ...es/evmraceresults/evm_benchmarks_geth.csv
diff --git a/evm/evmraceresults/evm_benchmarks_parity.csv → .../evmraceresults/evm_benchmarks_parity.csv b/evm/evmraceresults/evm_benchmarks_parity.csv → .../evmraceresults/evm_benchmarks_parity.csv
diff --git a/...aceresults/geth_precompile_benchmarks.csv → ...aceresults/geth_precompile_benchmarks.csv b/...aceresults/geth_precompile_benchmarks.csv → ...aceresults/geth_precompile_benchmarks.csv
diff --git a/...eresults/parity_precompile_benchmarks.csv → ...eresults/parity_precompile_benchmarks.csv b/...eresults/parity_precompile_benchmarks.csv → ...eresults/parity_precompile_benchmarks.csv
diff --git a/evm/geth/Dockerfile → evm-engines/geth/Dockerfile b/evm/geth/Dockerfile → evm-engines/geth/Dockerfile
diff --git a/evm/input_data/evmcode/blake2b.hex → evm-engines/input_data/evmcode/blake2b.hex b/evm/input_data/evmcode/blake2b.hex → evm-engines/input_data/evmcode/blake2b.hex
diff --git a/evm/input_data/evmcode/blake2b.sol → evm-engines/input_data/evmcode/blake2b.sol b/evm/input_data/evmcode/blake2b.sol → evm-engines/input_data/evmcode/blake2b.sol
diff --git a/evm/input_data/evmcode/blake2b_huff.hex → ...gines/input_data/evmcode/blake2b_huff.hex b/evm/input_data/evmcode/blake2b_huff.hex → ...gines/input_data/evmcode/blake2b_huff.hex
diff --git a/evm/input_data/evmcode/blake2b_huff.huff → ...ines/input_data/evmcode/blake2b_huff.huff b/evm/input_data/evmcode/blake2b_huff.huff → ...ines/input_data/evmcode/blake2b_huff.huff
diff --git a/evm/input_data/evmcode/blake2b_shift.hex → ...ines/input_data/evmcode/blake2b_shift.hex b/evm/input_data/evmcode/blake2b_shift.hex → ...ines/input_data/evmcode/blake2b_shift.hex
diff --git a/evm/input_data/evmcode/blake2b_shift.sol → ...ines/input_data/evmcode/blake2b_shift.sol b/evm/input_data/evmcode/blake2b_shift.sol → ...ines/input_data/evmcode/blake2b_shift.sol
diff --git a/...t_data/evmcode/bn128_mul_weierstrudel.hex → ...t_data/evmcode/bn128_mul_weierstrudel.hex b/...t_data/evmcode/bn128_mul_weierstrudel.hex → ...t_data/evmcode/bn128_mul_weierstrudel.hex
diff --git a/...t_data/evmcode/bn128_mul_weierstrudel.sol → ...t_data/evmcode/bn128_mul_weierstrudel.sol b/...t_data/evmcode/bn128_mul_weierstrudel.sol → ...t_data/evmcode/bn128_mul_weierstrudel.sol
diff --git a/evm/input_data/evmcode/bn256g2mul.hex → ...engines/input_data/evmcode/bn256g2mul.hex b/evm/input_data/evmcode/bn256g2mul.hex → ...engines/input_data/evmcode/bn256g2mul.hex
diff --git a/evm/input_data/evmcode/bn256g2mul.sol → ...engines/input_data/evmcode/bn256g2mul.sol b/evm/input_data/evmcode/bn256g2mul.sol → ...engines/input_data/evmcode/bn256g2mul.sol
diff --git a/evm/input_data/evmcode/mul256.hex → evm-engines/input_data/evmcode/mul256.hex b/evm/input_data/evmcode/mul256.hex → evm-engines/input_data/evmcode/mul256.hex
diff --git a/evm/input_data/evmcode/mul256.sol → evm-engines/input_data/evmcode/mul256.sol b/evm/input_data/evmcode/mul256.sol → evm-engines/input_data/evmcode/mul256.sol
diff --git a/evm/input_data/evmcode/sha1.hex → evm-engines/input_data/evmcode/sha1.hex b/evm/input_data/evmcode/sha1.hex → evm-engines/input_data/evmcode/sha1.hex
diff --git a/evm/input_data/evmcode/sha1.sol → evm-engines/input_data/evmcode/sha1.sol b/evm/input_data/evmcode/sha1.sol → evm-engines/input_data/evmcode/sha1.sol
diff --git a/evm/input_data/evmcode/sha1_shift.hex → ...engines/input_data/evmcode/sha1_shift.hex b/evm/input_data/evmcode/sha1_shift.hex → ...engines/input_data/evmcode/sha1_shift.hex
diff --git a/evm/input_data/evmcode/sha1_shift.sol → ...engines/input_data/evmcode/sha1_shift.sol b/evm/input_data/evmcode/sha1_shift.sol → ...engines/input_data/evmcode/sha1_shift.sol
diff --git a/...ut_data/input_vectors/blake2b-inputs.json → ...ut_data/input_vectors/blake2b-inputs.json b/...ut_data/input_vectors/blake2b-inputs.json → ...ut_data/input_vectors/blake2b-inputs.json
diff --git a/...ta/input_vectors/blake2b_huff-inputs.json → ...ta/input_vectors/blake2b_huff-inputs.json b/...ta/input_vectors/blake2b_huff-inputs.json → ...ta/input_vectors/blake2b_huff-inputs.json
diff --git a/...ectors/bn128_mul_weierstrudel-inputs.json → ...ectors/bn128_mul_weierstrudel-inputs.json b/...ectors/bn128_mul_weierstrudel-inputs.json → ...ectors/bn128_mul_weierstrudel-inputs.json
diff --git a/...data/input_vectors/bn256g2mul-inputs.json → ...data/input_vectors/bn256g2mul-inputs.json b/...data/input_vectors/bn256g2mul-inputs.json → ...data/input_vectors/bn256g2mul-inputs.json
diff --git a/...put_data/input_vectors/mul256-inputs.json → ...put_data/input_vectors/mul256-inputs.json b/...put_data/input_vectors/mul256-inputs.json → ...put_data/input_vectors/mul256-inputs.json
diff --git a/...input_data/input_vectors/sha1-inputs.json → ...input_data/input_vectors/sha1-inputs.json b/...input_data/input_vectors/sha1-inputs.json → ...input_data/input_vectors/sha1-inputs.json
diff --git a/evm/parity/Dockerfile → evm-engines/parity/Dockerfile b/evm/parity/Dockerfile → evm-engines/parity/Dockerfile
diff --git a/evm/scripts/bench_evm384.py → evm-engines/scripts/bench_evm384.py b/evm/scripts/bench_evm384.py → evm-engines/scripts/bench_evm384.py
diff --git a/evm/scripts/benchevm.py → evm-engines/scripts/benchevm.py b/evm/scripts/benchevm.py → evm-engines/scripts/benchevm.py
diff --git a/evm/scripts/benchgethprecompiles.py → evm-engines/scripts/benchgethprecompiles.py b/evm/scripts/benchgethprecompiles.py → evm-engines/scripts/benchgethprecompiles.py
diff --git a/evm/scripts/benchparityprecompiles.py → ...engines/scripts/benchparityprecompiles.py b/evm/scripts/benchparityprecompiles.py → ...engines/scripts/benchparityprecompiles.py
diff --git a/evm/scripts/merge.py → evm-engines/scripts/merge.py b/evm/scripts/merge.py → evm-engines/scripts/merge.py
diff --git a/evm/scripts/nanodurationpy.py → evm-engines/scripts/nanodurationpy.py b/evm/scripts/nanodurationpy.py → evm-engines/scripts/nanodurationpy.py
diff --git a/evm/scripts/run_bench.sh → evm-engines/scripts/run_bench.sh b/evm/scripts/run_bench.sh → evm-engines/scripts/run_bench.sh