precompiles: Remove optional "silkpre" backend

Drop the CMake EVMONE_PRECOMPILES_SILKPRE option. Silkpre is outdated
and it only provided useful (not slower than evmone) implementations
for ecrecover and modexp. These are now covered directly by libsecp256k1
and GMP options.

Author: chfast

circle.yml

@@ -503,28 +503,6 @@ jobs:
       - upload_coverage:
           flags: eest-develop-gmp
 
-  precompiles-silkpre:
-    executor: linux-clang-latest
-    environment:
-      BUILD_TYPE: Release
-      CMAKE_OPTIONS: -DCOVERAGE=1 -DEVMONE_PRECOMPILES_SILKPRE=1
-    steps:
-      - run:
-          name: "Install GMP"
-          command: sudo apt-get -q update && sudo apt-get -qy install libgmp-dev
-      - build
-      - download_execution_tests:
-          rev: v17.1
-          legacy: false
-      - run:
-          name: "State tests"
-          working_directory: ~/build
-          command: |
-            bin/evmone-statetest ~/tests/GeneralStateTests
-      - collect_coverage_clang
-      - upload_coverage:
-          flags: eest-legacy-silkpre
-
   gcc-min:
     executor: linux-gcc-min
     steps:
@@ -709,7 +687,6 @@ workflows:
       - ethereum-tests
       - precompiles-libsecp256k1
       - precompiles-gmp
-      - precompiles-silkpre
       - cmake-min
       - gcc-min
       - clang-min

test/precompiles_bench/precompiles_bench.cpp

@@ -19,10 +19,6 @@
 #include <state/precompiles_gmp.hpp>
 #endif
 
-#ifdef EVMONE_PRECOMPILES_SILKPRE
-#include <state/precompiles_silkpre.hpp>
-#endif
-
 namespace
 {
 using namespace evmone::state;
@@ -326,10 +322,6 @@ BENCHMARK_TEMPLATE(precompile, PrecompileId::ecrecover, evmone);
 constexpr auto libsecp256k1 = ecrecover_execute_libsecp256k1;
 BENCHMARK_TEMPLATE(precompile, PrecompileId::ecrecover, libsecp256k1);
 #endif
-#ifdef EVMONE_PRECOMPILES_SILKPRE
-constexpr auto silkpre_libsecp256k1 = silkpre_ecrecover_execute;
-BENCHMARK_TEMPLATE(precompile, PrecompileId::ecrecover, silkpre_libsecp256k1);
-#endif
 }  // namespace bench_ecrecovery
 
 namespace bench_expmod
@@ -340,40 +332,24 @@ BENCHMARK(precompile<PrecompileId::expmod, evmone>);
 constexpr auto gmp = expmod_execute_gmp;
 BENCHMARK(precompile<PrecompileId::expmod, gmp>);
 #endif
-#ifdef EVMONE_PRECOMPILES_SILKPRE
-constexpr auto silkpre = silkpre_expmod_execute;
-BENCHMARK(precompile<PrecompileId::expmod, silkpre>);
-#endif
 }  // namespace bench_expmod
 
 namespace bench_ecadd
 {
 constexpr auto evmmax_cpp = ecadd_execute;
 BENCHMARK_TEMPLATE(precompile, PrecompileId::ecadd, evmmax_cpp);
-#ifdef EVMONE_PRECOMPILES_SILKPRE
-constexpr auto libff = silkpre_ecadd_execute;
-BENCHMARK_TEMPLATE(precompile, PrecompileId::ecadd, libff);
-#endif
 }  // namespace bench_ecadd
 
 namespace bench_ecmul
 {
 constexpr auto evmmax_cpp = ecmul_execute;
 BENCHMARK_TEMPLATE(precompile, PrecompileId::ecmul, evmmax_cpp);
-#ifdef EVMONE_PRECOMPILES_SILKPRE
-constexpr auto libff = silkpre_ecmul_execute;
-BENCHMARK_TEMPLATE(precompile, PrecompileId::ecmul, libff);
-#endif
 }  // namespace bench_ecmul
 
 namespace bench_ecpairing
 {
 constexpr auto evmmax_cpp = ecpairing_execute;
 BENCHMARK_TEMPLATE(precompile, PrecompileId::ecpairing, evmmax_cpp);
-#ifdef EVMONE_PRECOMPILES_SILKPRE
-constexpr auto libff = silkpre_ecpairing_execute;
-BENCHMARK_TEMPLATE(precompile, PrecompileId::ecpairing, libff);
-#endif
 }  // namespace bench_ecpairing
 
 namespace bench_kzg

test/state/CMakeLists.txt

@@ -84,40 +84,6 @@ if(EVMONE_PRECOMPILES_LIBSECP256K1)
     set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_ORIG})
 endif()
 
-option(EVMONE_PRECOMPILES_SILKPRE "Enable precompiles from silkpre library (for benchmarking only)" OFF)
-if(EVMONE_PRECOMPILES_SILKPRE)
-    # Silkpre requires the ethash library, so enable it in Hunter.
-    hunter_add_package(ethash)
-
-    FetchContent_Declare(
-        silkpre
-        GIT_REPOSITORY https://github.com/erigontech/silkpre
-        GIT_TAG f972090a41de75073f55e914bf0107838b4b86a4
-        GIT_SHALLOW TRUE
-    )
-    set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
-    set(BUILD_SHARED_LIBS_ORIG ${BUILD_SHARED_LIBS})
-    set(BUILD_SHARED_LIBS OFF)
-    FetchContent_MakeAvailable(silkpre)
-    set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_ORIG})
-
-    set_target_properties(
-        silkpre secp256k1 ff
-        PROPERTIES
-        COMPILE_OPTIONS -w  # Disable warnings.
-        CXX_CLANG_TIDY ""
-    )
-
-    target_link_libraries(evmone-state PRIVATE silkpre)
-    target_compile_definitions(evmone-state PUBLIC EVMONE_PRECOMPILES_SILKPRE=1)
-    target_sources(
-        evmone-state PRIVATE
-        precompiles_silkpre.hpp
-        precompiles_silkpre.cpp
-    )
-endif()
-
-# This is done after Silkpre because it also tries to find GMP.
 option(EVMONE_PRECOMPILES_GMP "Enable precompiles implementations via the GMP/MPIR library" OFF)
 if(EVMONE_PRECOMPILES_GMP)
     find_package(GMP REQUIRED)