cleanups

Author: chfast

test/experimental/jumpdest_analysis.cpp

@@ -11,7 +11,7 @@
 
 namespace evmone::exp::jda
 {
-JumpdestBitset jda_reference(bytes_view code)
+JumpdestBitset reference(bytes_view code)
 {
     JumpdestBitset map(code.size());
     for (size_t i = 0; i < code.size(); ++i)
@@ -59,7 +59,7 @@ static pushdata_info build_pushdata_mask(const uint8_t* code, uint32_t push_mask
     return {pushdata_mask, 32};
 }
 
-JumpdestBitset jda_speculate_push_data_size(bytes_view code)
+JumpdestBitset speculate_push_data_size(bytes_view code)
 {
     JumpdestBitset m(code.size());
     for (size_t i = 0; i < code.size(); ++i)

test/experimental/jumpdest_analysis.hpp

@@ -64,8 +64,8 @@ class bitset32
     }
 };
 
-JumpdestBitset jda_reference(bytes_view code);
-JumpdestBitset jda_speculate_push_data_size(bytes_view code);
+JumpdestBitset reference(bytes_view code);
+JumpdestBitset speculate_push_data_size(bytes_view code);
 JumpdestBitset jda_speculate_push_data_size2(bytes_view code);
 JumpdestBitset build_jumpdest_map_sttni(bytes_view code);
 std::vector<bool> build_jumpdest_map_str_avx2(const uint8_t* code, size_t code_size);

test/fuzzer/jumpdest_analysis_fuzz.cpp

@@ -29,8 +29,8 @@ inline bool is_jumpdest(const bitset32& a, size_t index) noexcept
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t data_size) noexcept
 {
     const bytes_view code{data, data_size};
-    const auto a0 = jda_reference(code);
-    const auto v2 = jda_speculate_push_data_size(data);
+    const auto a0 = reference(code);
+    const auto v2 = speculate_push_data_size(data);
     const auto v3 = build_jumpdest_map_sttni(code);
     const auto v4 = build_jumpdest_map_str_avx2(data, data_size);
     const auto v5 = build_jumpdest_map_str_avx2_mask(data, data_size);

test/internal_benchmarks/analysis_bench.cpp

@@ -325,9 +325,9 @@ void jumpdest_analysis(State& state)
 
 #define ARGS ->DenseRange(0, test_bytecodes.size() - 1)
 
-BENCHMARK(jumpdest_analysis<JumpdestBitset, jda_reference>) ARGS;
+BENCHMARK(jumpdest_analysis<JumpdestBitset, reference>) ARGS;
 BENCHMARK(jumpdest_analysis<JumpdestBitset, build_jumpdest_map_sttni>) ARGS;
-BENCHMARK(jumpdest_analysis<JumpdestBitset, jda_speculate_push_data_size>) ARGS;
+BENCHMARK(jumpdest_analysis<JumpdestBitset, speculate_push_data_size>) ARGS;
 BENCHMARK(jumpdest_analysis<JumpdestBitset, jda_speculate_push_data_size2>) ARGS;
 
 BENCHMARK_TEMPLATE(

test/unittests/jumpdest_analysis_test.cpp

@@ -62,7 +62,7 @@ template <typename>
 class jumpdest_analysis_test : public testing::Test
 {};
 using test_types = testing::Types<I<baseline::CodeAnalysis, baseline_analyze>,
-    I<JumpdestBitset, jda_speculate_push_data_size>,
+    I<JumpdestBitset, speculate_push_data_size>,
     I<JumpdestBitset, jda_speculate_push_data_size2>, I<JumpdestBitset, build_jumpdest_map_sttni>>;
 TYPED_TEST_SUITE(jumpdest_analysis_test, test_types);
 
@@ -71,7 +71,7 @@ TYPED_TEST(jumpdest_analysis_test, validate)
     for (size_t t = 0; t < std::size(bytecode_test_cases); ++t)
     {
         const auto& code = bytecode_test_cases[t];
-        const auto expected = jda_reference(code);
+        const auto expected = reference(code);
         const auto analysis = TypeParam::analyze(code);
 
         for (size_t i = 0; i < code.size() + CODE_PADDING_CHECK_SIZE; ++i)
@@ -90,7 +90,7 @@ TEST(jumpdest_analysis, compare_implementations)
         const auto data = t.data();
         const auto data_size = t.size();
 
-        const auto a0 = jda_reference(t);
+        const auto a0 = reference(t);
         const auto v4 = build_jumpdest_map_str_avx2(data, data_size);
         const auto v5 = build_jumpdest_map_str_avx2_mask(data, data_size);
         const auto v5a = build_jumpdest_map_str_avx2_mask_v2(data, data_size);