yet another GPU squash

NilFoundation · Jan 24, 2025 · 78b5842 · 78b5842
1 parent 3e5aaf6
commit 78b5842
Show file tree

Hide file tree

Showing 60 changed files with 2,292 additions and 136 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 3.27)
 
 project(placeholder)
 
+option(GPU_PROVER "Enable GPU support" OFF)
+if (GPU_PROVER)
+  add_compile_options(-DGPU_PROVER)
+endif()
+
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   add_compile_options (-fdiagnostics-color=always)
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
@@ -26,7 +31,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generated-dummy.cpp)
 add_library(crypto3_precompiled_headers STATIC ${CMAKE_CURRENT_BINARY_DIR}/generated-dummy.cpp)
 set_target_properties(crypto3_precompiled_headers PROPERTIES
     LINKER_LANGUAGE CXX
-    CXX_STANDARD 20
+    CXX_STANDARD 23
     CXX_STANDARD_REQUIRED TRUE
 )
 

diff --git a/crypto3/benchmarks/CMakeLists.txt b/crypto3/benchmarks/CMakeLists.txt
@@ -40,7 +40,7 @@ macro(define_benchmark benchmark)
 
     set_target_properties(${full_name}
         PROPERTIES
-        CXX_STANDARD 20
+        CXX_STANDARD 23
         CXX_STANDARD_REQUIRED TRUE)
 
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

diff --git a/crypto3/libs/algebra/example/CMakeLists.txt b/crypto3/libs/algebra/example/CMakeLists.txt
@@ -15,7 +15,7 @@ macro(define_algebra_example name)
                           Boost::random
                       )
 
-    set_target_properties(algebra_${name}_example PROPERTIES CXX_STANDARD 20)
+    set_target_properties(algebra_${name}_example PROPERTIES CXX_STANDARD 23)
 endmacro()
 
 set(EXAMPLES_NAMES

diff --git a/crypto3/libs/algebra/test/CMakeLists.txt b/crypto3/libs/algebra/test/CMakeLists.txt
@@ -23,7 +23,7 @@ macro(define_runtime_algebra_test name)
 
             ${Boost_INCLUDE_DIRS})
 
-    set_target_properties(${test_name} PROPERTIES CXX_STANDARD 20
+    set_target_properties(${test_name} PROPERTIES CXX_STANDARD 23
             CXX_STANDARD_REQUIRED TRUE)
 
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -44,7 +44,7 @@ macro(define_compile_time_algebra_test name)
 
             ${Boost_INCLUDE_DIRS})
 
-    set_target_properties(algebra_${name}_compile_test PROPERTIES CXX_STANDARD 20)
+    set_target_properties(algebra_${name}_compile_test PROPERTIES CXX_STANDARD 23)
 endmacro()
 
 set(RUNTIME_TESTS_NAMES

diff --git a/crypto3/libs/blueprint/example/CMakeLists.txt b/crypto3/libs/blueprint/example/CMakeLists.txt
@@ -21,7 +21,7 @@ macro(define_blueprint_example name)
                           ${CMAKE_WORKSPACE_NAME}::multiprecision
                           ${CMAKE_WORKSPACE_NAME}::zk
     )
-    set_target_properties(${full_example_name} PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED TRUE)
+    set_target_properties(${full_example_name} PROPERTIES CXX_STANDARD 23 CXX_STANDARD_REQUIRED TRUE)
 endmacro()
 
 

diff --git a/crypto3/libs/blueprint/test/CMakeLists.txt b/crypto3/libs/blueprint/test/CMakeLists.txt
@@ -44,7 +44,7 @@ cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
         crypto3::hash
         Boost::unit_test_framework
 )
-set_target_properties(_cm_internal_tests-crypto3-blueprint-test PROPERTIES CXX_STANDARD 20)
+set_target_properties(_cm_internal_tests-crypto3-blueprint-test PROPERTIES CXX_STANDARD 23)
 target_precompile_headers(_cm_internal_tests-crypto3-blueprint-test REUSE_FROM crypto3_precompiled_headers)
 
 macro(define_blueprint_test test)
@@ -60,7 +60,7 @@ macro(define_blueprint_test test)
     target_include_directories(${full_test_name} PRIVATE
                                ${Boost_INCLUDE_DIRS})
 
-    set_target_properties(${full_test_name} PROPERTIES CXX_STANDARD 20)
+    set_target_properties(${full_test_name} PROPERTIES CXX_STANDARD 23)
 
     target_compile_definitions(${full_test_name} PRIVATE TEST_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/zkevm/data/")
 

diff --git a/crypto3/libs/blueprint/test/zkevm_bbf/hardhat.cpp b/crypto3/libs/blueprint/test/zkevm_bbf/hardhat.cpp
@@ -139,7 +139,7 @@ class zkEVMHardhatTestFixture: public BBFTestFixture {
         // std::cout << std::endl;
 
         // Max_copy, Max_rw, Max_keccak, Max_bytecode
-        result =test_bbf_component<field_type, nil::blueprint::bbf::exponentiation>(
+        result = test_bbf_component<field_type, nil::blueprint::bbf::exponentiation>(
             "exp",
             {}, exp_assignment_input, exp_constraint_input,
             max_exp_rows,

diff --git a/crypto3/libs/containers/example/CMakeLists.txt b/crypto3/libs/containers/example/CMakeLists.txt
@@ -37,7 +37,7 @@ macro(define_containers_example example)
             ${CMAKE_WORKSPACE_NAME}::algebra
             ${CMAKE_WORKSPACE_NAME}::hash
             Boost::container)
-    set_target_properties(${target_name} PROPERTIES CXX_STANDARD 20)
+    set_target_properties(${target_name} PROPERTIES CXX_STANDARD 23)
 endmacro()
 
 set(EXAMPLES_NAMES

diff --git a/crypto3/libs/containers/test/CMakeLists.txt b/crypto3/libs/containers/test/CMakeLists.txt
@@ -33,7 +33,7 @@ cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
     Boost::unit_test_framework
     Boost::random
 )
-set_target_properties(_cm_internal_tests-crypto3-containers-test PROPERTIES CXX_STANDARD 20)
+set_target_properties(_cm_internal_tests-crypto3-containers-test PROPERTIES CXX_STANDARD 23)
 target_precompile_headers(_cm_internal_tests-crypto3-containers-test REUSE_FROM crypto3_precompiled_headers)
 
 macro(define_storage_test test)
@@ -57,7 +57,7 @@ macro(define_storage_test test)
         Boost::random
     )
 
-    set_target_properties(${full_test_name} PROPERTIES CXX_STANDARD 20)
+    set_target_properties(${full_test_name} PROPERTIES CXX_STANDARD 23)
 
      if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         target_compile_options(${full_test_name} PRIVATE "-fconstexpr-steps=2147483647" "-ftemplate-backtrace-limit=0")

diff --git a/crypto3/libs/hash/test/CMakeLists.txt b/crypto3/libs/hash/test/CMakeLists.txt
@@ -12,7 +12,7 @@ cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
                        ${${CURRENT_PROJECT_NAME}_INTERFACE_LIBRARIES}
                        Boost::unit_test_framework)
 
-set_target_properties(_cm_internal_tests-crypto3-hash-test PROPERTIES CXX_STANDARD 20)
+set_target_properties(_cm_internal_tests-crypto3-hash-test PROPERTIES CXX_STANDARD 23)
 target_precompile_headers(_cm_internal_tests-crypto3-hash-test REUSE_FROM crypto3_precompiled_headers)
 
 macro(define_hash_test name)
@@ -27,7 +27,7 @@ macro(define_hash_test name)
                                ${Boost_INCLUDE_DIRS})
 
     set_target_properties(${test_name} PROPERTIES
-                          CXX_STANDARD 20
+                          CXX_STANDARD 23
                           CXX_STANDARD_REQUIRED TRUE)
 
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

diff --git a/crypto3/libs/marshalling/algebra/test/CMakeLists.txt b/crypto3/libs/marshalling/algebra/test/CMakeLists.txt
@@ -32,7 +32,7 @@ macro(define_marshalling_test name)
                                ${Boost_INCLUDE_DIRS})
 
     set_target_properties(${test_name} PROPERTIES
-                          CXX_STANDARD 20
+                          CXX_STANDARD 23
                           CXX_STANDARD_REQUIRED TRUE)
 
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

diff --git a/crypto3/libs/marshalling/core/CMakeLists.txt b/crypto3/libs/marshalling/core/CMakeLists.txt
@@ -20,7 +20,7 @@ if(CRYPTO3_MARSHALLING_THROWS)
 endif()
 
 if(NOT CMAKE_CXX_STANDARD)
-    set_target_properties(${test_name} PROPERTIES CXX_STANDARD 20)
+    set_target_properties(${test_name} PROPERTIES CXX_STANDARD 23)
 endif()
 
 cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME})

diff --git a/crypto3/libs/marshalling/core/test/CMakeLists.txt b/crypto3/libs/marshalling/core/test/CMakeLists.txt
@@ -28,7 +28,7 @@ macro(define_marshalling_test name)
                                ${Boost_INCLUDE_DIRS})
 
     set_target_properties(marshalling_core_${name}_test PROPERTIES
-                          CXX_STANDARD 20
+                          CXX_STANDARD 23
                           CXX_STANDARD_REQUIRED TRUE)
 endmacro()
 

diff --git a/crypto3/libs/marshalling/multiprecision/CMakeLists.txt b/crypto3/libs/marshalling/multiprecision/CMakeLists.txt
@@ -18,7 +18,7 @@ cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_
 add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE)
 add_library(${CMAKE_WORKSPACE_NAME}::${CURRENT_PROJECT_NAME} ALIAS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME})
 
-set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES CXX_STANDARD 20)
+set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES CXX_STANDARD 23)
 
 set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES
                       EXPORT_NAME ${CURRENT_PROJECT_NAME})

diff --git a/crypto3/libs/marshalling/multiprecision/test/CMakeLists.txt b/crypto3/libs/marshalling/multiprecision/test/CMakeLists.txt
@@ -39,7 +39,7 @@ macro(define_marshalling_test name)
                                ${Boost_INCLUDE_DIRS})
 
     set_target_properties(marshalling_${name}_test PROPERTIES
-                          CXX_STANDARD 20
+                          CXX_STANDARD 23
                           CXX_STANDARD_REQUIRED TRUE)
 
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

diff --git a/crypto3/libs/marshalling/zk/test/CMakeLists.txt b/crypto3/libs/marshalling/zk/test/CMakeLists.txt
@@ -22,7 +22,7 @@ cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
         ${CMAKE_WORKSPACE_NAME}::marshalling-algebra
         ${CMAKE_WORKSPACE_NAME}::marshalling-core)
 
-set_target_properties(_cm_internal_tests-crypto3-marshalling-zk-test PROPERTIES CXX_STANDARD 20)
+set_target_properties(_cm_internal_tests-crypto3-marshalling-zk-test PROPERTIES CXX_STANDARD 23)
 target_precompile_headers(_cm_internal_tests-crypto3-marshalling-zk-test REUSE_FROM crypto3_precompiled_headers)
 
 macro(define_marshalling_test test)
@@ -40,7 +40,7 @@ macro(define_marshalling_test test)
             ${Boost_INCLUDE_DIRS})
 
     set_target_properties(marshalling_zk_${name}_test PROPERTIES
-            CXX_STANDARD 20
+            CXX_STANDARD 23
             CXX_STANDARD_REQUIRED TRUE)
 
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

diff --git a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp
@@ -883,4 +883,4 @@ struct std::hash<nil::crypto3::math::polynomial_dfs<FieldValueType, Allocator>>
     }
 };
 
-#endif    // CRYPTO3_MATH_POLYNOMIAL_POLYNOM_DFT_HPP
+#endif    // CRYPTO3_MATH_POLYNOMIAL_POLYNOM_DFT_HPP
diff --git a/crypto3/libs/math/test/CMakeLists.txt b/crypto3/libs/math/test/CMakeLists.txt
@@ -24,7 +24,7 @@ macro(define_math_test name)
 
                                ${Boost_INCLUDE_DIRS})
 
-    set_target_properties(${test_name} PROPERTIES CXX_STANDARD 20)
+    set_target_properties(${test_name} PROPERTIES CXX_STANDARD 23)
 
 endmacro()
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     };
-    #endif    // CRYPTO3_MATH_POLYNOMIAL_POLYNOM_DFT_HPP
+    #endif    // CRYPTO3_MATH_POLYNOMIAL_POLYNOM_DFT_HPP