pyqrandomx 0.3.2__tar.gz → 0.3.3__tar.gz

{pyqrandomx-0.3.2 → pyqrandomx-0.3.3}/.circleci/config.yml

@@ -2,56 +2,57 @@ version: 2
 jobs:
   build:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:noble
     steps:
       - checkout
       - run: git submodule update --init --recursive
-      - run: cmake -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5
+      - run: cmake .
       - run: make
       - run: export GTEST_COLOR=1 && ctest -VV
 
   sanitize_address:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:noble
     steps:
       - checkout
       - run: git submodule update --init --recursive
-      - run: cmake -DSANITIZE_ADDRESS=ON -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5
+      - run: cmake -DSANITIZE_ADDRESS=ON .
       - run: make
       - run: export GTEST_COLOR=1 && ctest -VV
 
   sanitize_thread:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:noble
     steps:
       - checkout
       - run: git submodule update --init --recursive
-      - run: cmake -DSANITIZE_THREAD=ON -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5
+      - run: cmake -DSANITIZE_THREAD=ON .
       - run: make
       - run: export GTEST_COLOR=1 && ctest -VV
 
   sanitize_undefined:
     docker:
-      - image: qrledger/qrl-docker:bionic
+      - image: qrledger/qrl-docker-ci:noble
     steps:
       - checkout
       - run: git submodule update --init --recursive
-      - run: cmake -DSANITIZE_UNDEFINED=ON
+      - run: cmake -DSANITIZE_UNDEFINED=ON .
       - run: make
       - run: export GTEST_COLOR=1 && ctest -VV
 
   test_python:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:noble
     steps:
       - checkout
       - run: git submodule update --init --recursive
-      - run: pip3 install PyScaffold
-      - run: python3 setup.py test
+      - run: pip3 install PyScaffold pytest pytest-cov
+      - run: pip3 install -e .
+      - run: python3 -m pytest --cov=pyqrandomx tests/
 
   deploy-pypi:
     docker:
-      - image: qrledger/qrl-docker:xenial
+      - image: qrledger/qrl-docker-ci:noble
     steps:
       - checkout
       - run: git submodule update --init --recursive

{pyqrandomx-0.3.2 → pyqrandomx-0.3.3}/.gitignore

@@ -59,3 +59,16 @@ coverage\.xml
 modeling/\.ipynb_checkpoints/
 
 dist/
+/googletest-src
+/CMakeCache.txt
+CMakeFiles/
+googletest-build/
+googletest-download/
+Testing/
+/cmake_install.cmake
+/CTestTestfile.cmake
+/DartConfiguration.tcl
+/pyqrandomx/qrandomxPYTHON_wrap.cxx
+/pyqrandomx/qrandomxPYTHON_wrap.h
+/qrandomx_test
+/Makefile

{pyqrandomx-0.3.2 → pyqrandomx-0.3.3}/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "deps/RandomX"]
 	path = deps/RandomX
-	url = https://github.com/cyyber/RandomX
+	url = https://github.com/theQRL/RandomX

{pyqrandomx-0.3.2 → pyqrandomx-0.3.3}/CMakeLists.txt

@@ -4,19 +4,41 @@
 cmake_minimum_required(VERSION 3.10)
 project(qrandomx)
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(CMAKE_CXX_COMPILER "/usr/local/bin/g++-10" CACHE STRING "C compiler" FORCE)
-    set(CMAKE_C_COMPILER "/usr/local/bin/gcc-10" CACHE STRING "C++ compiler" FORCE)
-    set(CMAKE_CXX_STANDARD 14)
-else ()
-  set(CMAKE_CXX_STANDARD 14)
-endif()
-
-SET(CMAKE_CXX_FLAGS " -pthread")
-
-if(NOT WIN32)
-        set(CMAKE_CXX_FLAGS "-march=native -mtune=native ${CMAKE_CXX_FLAGS} -msse2 -maes")
-        set(CMAKE_C_FLAGS "-march=native -mtune=native -fPIC ${CMAKE_C_FLAGS} -msse2 -maes")
+set(CMAKE_CXX_STANDARD 14)
+
+if (NOT WIN32)
+    # ISA baseline.
+    #
+    # Building with -march=native produces binaries that only run on CPUs at
+    # least as capable as the build machine. That is fine for a local build but
+    # wrong for anything distributed (PyPI wheels, container images): a CI
+    # runner with, say, AVX-512 VBMI yields code that dies with SIGILL on an
+    # older AVX-512 part such as Skylake-SP/W. Default to a portable baseline
+    # and let a machine-local build opt in with -DQRX_ARCH_X86=native.
+    if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$")
+        include(CheckCXXCompilerFlag)
+        check_cxx_compiler_flag("-march=x86-64-v2" QRX_HAS_X86_64_V2)
+        if (QRX_HAS_X86_64_V2)
+            set(_QRX_ARCH_X86_DEFAULT "x86-64-v2")
+        else()
+            # -march=x86-64-v2 needs GCC >= 11 / Clang >= 12; nehalem is the
+            # equivalent baseline understood by older compilers.
+            set(_QRX_ARCH_X86_DEFAULT "nehalem")
+        endif()
+        set(QRX_ARCH_X86 "${_QRX_ARCH_X86_DEFAULT}" CACHE STRING
+            "x86-64 ISA baseline; use 'native' for a machine-local build")
+        set(_BASE_CXX_FLAGS "-march=${QRX_ARCH_X86} -mtune=generic -msse2 -maes")
+        set(_BASE_C_FLAGS   "-march=${QRX_ARCH_X86} -mtune=generic -msse2 -maes -fPIC")
+    else()
+        set(QRX_ARCH_ARM "armv8-a+crypto+fp+simd" CACHE STRING
+            "AArch64 ISA baseline; use 'native' for a machine-local build")
+        set(_BASE_CXX_FLAGS "-march=${QRX_ARCH_ARM} -mtune=generic")
+        set(_BASE_C_FLAGS   "-march=${QRX_ARCH_ARM} -mtune=generic -fPIC")
+    endif()
+
+    # Caller-supplied flags go last so CXXFLAGS/CFLAGS can still override.
+    set(CMAKE_CXX_FLAGS "${_BASE_CXX_FLAGS} -pthread ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_C_FLAGS   "${_BASE_C_FLAGS} ${CMAKE_C_FLAGS}")
 endif()
 
 set(BUILD_TESTS ON CACHE BOOL "Enables tests")
@@ -71,7 +93,9 @@ list(APPEND REF_RANDOMX_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/soft_aes.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/superscalar.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/virtual_machine.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/virtual_memory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/virtual_memory.c
+        # Explicitly exclude the old virtual_memory.cpp to prevent build errors
+        # ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/virtual_memory.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/vm_compiled_light.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/vm_compiled.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/vm_interpreted_light.cpp
@@ -84,19 +108,59 @@ list(APPEND REF_RANDOMX_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/argon2_ssse3.c
         )
 
+# The vectorised Argon2 implementations are chosen at runtime -- see
+# deps/RandomX/src/randomx.cpp, which only uses randomx_argon2_impl_avx2() when
+# cpu.hasAvx2() is also true -- so they carry their own ISA flags instead of
+# relying on the global baseline. Mirrors deps/RandomX/CMakeLists.txt; without
+# this, both files compile to a NULL impl on a portable baseline and the Argon2
+# dataset initialisation silently falls back to the reference code.
+if (NOT WIN32 AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$")
+    include(CheckCCompilerFlag)
+    check_c_compiler_flag(-mssse3 QRX_HAS_MSSSE3)
+    if (QRX_HAS_MSSSE3)
+        set_source_files_properties(
+            ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/argon2_ssse3.c
+            PROPERTIES COMPILE_FLAGS -mssse3)
+    endif()
+    check_c_compiler_flag(-mavx2 QRX_HAS_MAVX2)
+    if (QRX_HAS_MAVX2)
+        set_source_files_properties(
+            ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/argon2_avx2.c
+            PROPERTIES COMPILE_FLAGS -mavx2)
+    endif()
+endif()
+
 if (CMAKE_C_COMPILER_ID MATCHES MSVC)
         enable_language(ASM_MASM)
         list(APPEND REF_RANDOMX_SRC
                 ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_x86_static.asm
                 ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_x86.cpp
                 )
-elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+elseif (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
         list(APPEND REF_RANDOMX_SRC
                 ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_x86_static.S
                 ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_x86.cpp
                 )
         # cheat because cmake and ccache hate each other
         set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+        enable_language(ASM)
+        list(APPEND REF_RANDOMX_SRC
+                ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_a64_static.S
+                ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_a64.cpp
+                )
+        # Set ASM language for ARM64
+        set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_a64_static.S PROPERTY LANGUAGE ASM)
+        # Set assembler flags for ARM64
+        set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv8-a+crypto")
+        set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/deps/RandomX/src/jit_compiler_a64_static.S 
+            PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp -march=armv8-a+crypto")
+        # Define ARM64 macro
+        add_definitions(-DRANDOMX_AARCH64=1)
+        # Ensure proper compiler flags for ARM64 JIT
+        if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+            set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -x assembler-with-cpp")
+        endif()
 endif()
 
 ## SWIG + API - Python related stuff

{pyqrandomx-0.3.2 → pyqrandomx-0.3.3}/PKG-INFO

@@ -1,14 +1,14 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.4
 Name: pyqrandomx
-Version: 0.3.2
+Version: 0.3.3
 Summary: QRL RandomX library
 Home-page: http://theqrl.org
 Author: The Quantum Resistant Ledger
 Author-email: info@theQRL.org
 License: GPL3
-Description: UNKNOWN
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.5
+License-File: LICENSE
+Dynamic: license-file

{pyqrandomx-0.3.2 → pyqrandomx-0.3.3}/README.md

@@ -1,4 +1,4 @@
-[![PyPI version](https://badge.fury.io/py/pyqrandomx.svg)](https://badge.fury.io/py/pyrandomx)
+[![PyPI version](https://badge.fury.io/py/pyqrandomx.svg)](https://badge.fury.io/py/pyqrandomx)
 
 [![CircleCI](https://circleci.com/gh/theQRL/qrandomx.svg?style=shield)](https://circleci.com/gh/theQRL/qrandomx)
 [![GPL3 licensed](https://img.shields.io/badge/license-GPL3-blue.svg)](https://raw.githubusercontent.com/theQRL/qrandomx/master/LICENSE)

pyqrandomx-0.3.3/deps/RandomX/.gitattributes

@@ -0,0 +1,3 @@
+.gitignore export-ignore
+.gitattributes export-ignore
+audits export-ignore

pyqrandomx-0.3.3/deps/RandomX/.github/workflows/c-cpp.yml

@@ -0,0 +1,226 @@
+name: C/C++ CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  build-alpine:
+
+    timeout-minutes: 15
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        config:
+          - {arch: x86_64, branch: latest-stable}
+          - {arch: x86, branch: latest-stable}
+          - {arch: aarch64, branch: latest-stable}
+          - {arch: armhf, branch: latest-stable}
+          - {arch: armv7, branch: latest-stable}
+          - {arch: ppc64le, branch: latest-stable}
+          - {arch: riscv64, branch: edge}
+          - {arch: s390x, branch: latest-stable}
+
+    steps:
+    - name: Setup Alpine Linux
+      uses: jirutka/setup-alpine@v1
+      with:
+        arch: ${{ matrix.config.arch }}
+        branch: ${{ matrix.config.branch }}
+
+    - name: Install dependencies
+      shell: alpine.sh --root {0}
+      run: |
+        apk add git cmake gcc g++ make
+
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Build RandomX
+      shell: alpine.sh {0}
+      run: |
+        mkdir build
+        cd build
+        cmake ..
+        make -j$(nproc)
+
+    - name: Run tests
+      shell: alpine.sh {0}
+      run: |
+        build/randomx-tests
+
+  build-ubuntu:
+
+    timeout-minutes: 5
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      matrix:
+        config:
+          - {os: ubuntu-20.04, c: gcc-11, cpp: g++-11}
+          - {os: ubuntu-22.04, c: gcc-12, cpp: g++-12}
+
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+        sudo apt update
+        sudo apt install -y git build-essential cmake ${{ matrix.config.c }} ${{ matrix.config.cpp }}
+
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Build RandomX
+      run: |
+        mkdir build
+        cd build
+        cmake ..
+        make -j$(nproc)
+
+    - name: Run tests
+      run: |
+        build/randomx-tests
+
+  build-windows-msys2:
+
+    timeout-minutes: 15
+    runs-on: windows-latest
+
+    strategy:
+      matrix:
+        config:
+          - {c: "gcc", cxx: "g++"}
+          - {c: "clang", cxx: "clang++"}
+
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Setup MSYS2
+      uses: eine/setup-msys2@v2
+      with:
+        update: true
+        install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-lld mingw-w64-x86_64-cmake make
+
+    - name: Build RandomX
+      run: |
+        mkdir build
+        cd build
+        cmake .. -G "Unix Makefiles" -DCMAKE_C_COMPILER=${{ matrix.config.c }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cxx }}
+        make -j$(nproc)
+
+    - name: Run tests
+      run: |
+        build/randomx-tests.exe
+
+  build-windows-msbuild:
+
+    timeout-minutes: 5
+    runs-on: windows-${{ matrix.config.os }}
+
+    strategy:
+      matrix:
+        config:
+          - {arch: x64, os: 2019, vs: Visual Studio 16 2019, msbuild: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\amd64\\"}
+          - {arch: x64, os: 2022, vs: Visual Studio 17 2022, msbuild: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\"}
+          - {arch: Win32, os: 2019, vs: Visual Studio 16 2019, msbuild: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\"}
+          - {arch: Win32, os: 2022, vs: Visual Studio 17 2022, msbuild: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\"}
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Setup cmake
+      uses: lukka/get-cmake@latest
+
+    - name: Build RandomX
+      run: |
+        mkdir build
+        cd build
+        cmake .. -G "${{ matrix.config.vs }}" -A ${{ matrix.config.arch }}
+        & "${{ matrix.config.msbuild }}msbuild" -v:m /m /p:Configuration=Release randomx-tests.vcxproj
+
+    - name: Run tests
+      run: |
+        build/Release/randomx-tests.exe
+
+  build-macos:
+
+    timeout-minutes: 5
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-13, macos-14, macos-15]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Install dependencies
+      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake
+
+    - name: Build RandomX
+      run: |
+        mkdir build
+        cd build
+        cmake ..
+        make -j3
+
+    - name: Run tests
+      run: |
+        build/randomx-tests
+
+  build-freebsd:
+
+    timeout-minutes: 15
+    runs-on: ${{ matrix.os.host }}
+
+    strategy:
+      matrix:
+        os:
+          - name: freebsd
+            architecture: x86-64
+            version: '13.2'
+            host: ubuntu-22.04
+
+          - name: freebsd
+            architecture: arm64
+            version: '13.2'
+            host: ubuntu-22.04
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Build RandomX
+      uses: cross-platform-actions/action@v0.19.0
+      with:
+        operating_system: ${{ matrix.os.name }}
+        architecture: ${{ matrix.os.architecture }}
+        version: ${{ matrix.os.version }}
+        shell: bash
+        run: |
+          sudo pkg install -y cmake
+          mkdir build && cd build
+          cmake ..
+          make -j2
+          ./randomx-tests

{pyqrandomx-0.3.2 → pyqrandomx-0.3.3}/deps/RandomX/CMakeLists.txt

@@ -26,9 +26,11 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-cmake_minimum_required(VERSION 2.8.7)
+cmake_minimum_required(VERSION 3.5)
 
-set (randomx_sources
+project(RandomX)
+
+set(randomx_sources
 src/aes_hash.cpp
 src/argon2_ref.c
 src/argon2_ssse3.c
@@ -37,7 +39,7 @@ src/bytecode_machine.cpp
 src/cpu.cpp
 src/dataset.cpp
 src/soft_aes.cpp
-src/virtual_memory.cpp
+src/virtual_memory.c
 src/vm_interpreted.cpp
 src/allocator.cpp
 src/assembly_generator_x86.cpp
@@ -94,32 +96,53 @@ function(add_flag flag)
 endfunction()
 
 # x86-64
-if (ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64" OR ARCH_ID STREQUAL "amd64")
+if ((CMAKE_SIZEOF_VOID_P EQUAL 8) AND (ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64" OR ARCH_ID STREQUAL "amd64"))
   list(APPEND randomx_sources
-    src/jit_compiler_x86_static.S
     src/jit_compiler_x86.cpp)
-  # cheat because cmake and ccache hate each other
-  set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
-  set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
 
-  if(ARCH STREQUAL "native")
-    add_flag("-march=native")
+  if(MSVC)
+    enable_language(ASM_MASM)
+    list(APPEND randomx_sources src/jit_compiler_x86_static.asm)
+
+    set_property(SOURCE src/jit_compiler_x86_static.asm PROPERTY LANGUAGE ASM_MASM)
+
+    set_source_files_properties(src/argon2_avx2.c COMPILE_FLAGS /arch:AVX2)
+
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /DRELWITHDEBINFO")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /DRELWITHDEBINFO")
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/asm/configuration.asm
+      COMMAND powershell -ExecutionPolicy Bypass -File h2inc.ps1 ..\\src\\configuration.h > ..\\src\\asm\\configuration.asm SET ERRORLEVEL = 0
+      COMMENT "Generating configuration.asm at ${CMAKE_CURRENT_SOURCE_DIR}"
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vcxproj)
+    add_custom_target(generate-asm
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/asm/configuration.asm)
   else()
-    # default build has hardware AES enabled (software AES can be selected at runtime)
-    add_flag("-maes")
-    check_c_compiler_flag(-mssse3 HAVE_SSSE3)
-    if(HAVE_SSSE3)
-      set_source_files_properties(src/argon2_ssse3.c COMPILE_FLAGS -mssse3)
-    endif()
-    check_c_compiler_flag(-mavx2 HAVE_AVX2)
-    if(HAVE_AVX2)
-      set_source_files_properties(src/argon2_avx2.c COMPILE_FLAGS -mavx2)
+    list(APPEND randomx_sources src/jit_compiler_x86_static.S)
+
+    # cheat because cmake and ccache hate each other
+    set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
+    set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
+
+    if(ARCH STREQUAL "native")
+      add_flag("-march=native")
+    else()
+      # default build has hardware AES enabled (software AES can be selected at runtime)
+      add_flag("-maes")
+      check_c_compiler_flag(-mssse3 HAVE_SSSE3)
+      if(HAVE_SSSE3)
+        set_source_files_properties(src/argon2_ssse3.c COMPILE_FLAGS -mssse3)
+      endif()
+      check_c_compiler_flag(-mavx2 HAVE_AVX2)
+      if(HAVE_AVX2)
+        set_source_files_properties(src/argon2_avx2.c COMPILE_FLAGS -mavx2)
+      endif()
     endif()
   endif()
 endif()
 
 # PowerPC
-if (ARCH_ID STREQUAL "ppc64" OR ARCH_ID STREQUAL "ppc64le")
+if(ARCH_ID STREQUAL "ppc64" OR ARCH_ID STREQUAL "ppc64le")
   if(ARCH STREQUAL "native")
     add_flag("-mcpu=native")
   endif()
@@ -127,13 +150,13 @@ if (ARCH_ID STREQUAL "ppc64" OR ARCH_ID STREQUAL "ppc64le")
 endif()
 
 # ARMv8
-if (ARM_ID STREQUAL "aarch64" OR ARM_ID STREQUAL "arm64" OR ARM_ID STREQUAL "armv8-a")
+if(ARM_ID STREQUAL "aarch64" OR ARM_ID STREQUAL "arm64" OR ARM_ID STREQUAL "armv8-a")
   list(APPEND randomx_sources
     src/jit_compiler_a64_static.S
     src/jit_compiler_a64.cpp)
   # cheat because cmake and ccache hate each other
   set_property(SOURCE src/jit_compiler_a64_static.S PROPERTY LANGUAGE C)
-  set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
+  set_property(SOURCE src/jit_compiler_a64_static.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
 
   # not sure if this check is needed
   include(CheckIncludeFile)
@@ -150,16 +173,60 @@ if (ARM_ID STREQUAL "aarch64" OR ARM_ID STREQUAL "arm64" OR ARM_ID STREQUAL "arm
   endif()
 endif()
 
+# RISC-V
+if(ARCH_ID STREQUAL "riscv64")
+  list(APPEND randomx_sources
+    src/jit_compiler_rv64_static.S
+    src/jit_compiler_rv64.cpp)
+  # cheat because cmake and ccache hate each other
+  set_property(SOURCE src/jit_compiler_rv64_static.S PROPERTY LANGUAGE C)
+  set_property(SOURCE src/jit_compiler_rv64_static.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
+
+  # default build uses the RV64GC baseline
+  set(RVARCH "rv64gc")
+
+  # for native builds, enable Zba and Zbb if supported by the CPU
+  if(ARCH STREQUAL "native")
+    enable_language(ASM)
+    try_run(RANDOMX_ZBA_RUN_FAIL
+        RANDOMX_ZBA_COMPILE_OK
+        ${CMAKE_CURRENT_BINARY_DIR}/
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/tests/riscv64_zba.s
+        COMPILE_DEFINITIONS "-march=rv64gc_zba")
+    if (RANDOMX_ZBA_COMPILE_OK AND NOT RANDOMX_ZBA_RUN_FAIL)
+      set(RVARCH "${RVARCH}_zba")
+    endif()
+    try_run(RANDOMX_ZBB_RUN_FAIL
+        RANDOMX_ZBB_COMPILE_OK
+        ${CMAKE_CURRENT_BINARY_DIR}/
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/tests/riscv64_zbb.s
+        COMPILE_DEFINITIONS "-march=rv64gc_zbb")
+    if (RANDOMX_ZBB_COMPILE_OK AND NOT RANDOMX_ZBB_RUN_FAIL)
+      set(RVARCH "${RVARCH}_zbb")
+    endif()
+  endif()
+
+  add_flag("-march=${RVARCH}")
+endif()
+
 set(RANDOMX_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "RandomX Include path")
 
-add_library(randomx
-  ${randomx_sources})
+add_library(randomx ${randomx_sources})
+
+if(TARGET generate-asm)
+  add_dependencies(randomx generate-asm)
+endif()
+
 set_property(TARGET randomx PROPERTY POSITION_INDEPENDENT_CODE ON)
 set_property(TARGET randomx PROPERTY CXX_STANDARD 11)
 set_property(TARGET randomx PROPERTY CXX_STANDARD_REQUIRED ON)
+set_property(TARGET randomx PROPERTY PUBLIC_HEADER src/randomx.h)
+
+include(GNUInstallDirs)
 install(TARGETS randomx
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib)
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 add_executable(randomx-tests
   src/tests/tests.cpp)
@@ -176,7 +243,7 @@ target_link_libraries(randomx-codegen
 set_property(TARGET randomx-codegen PROPERTY POSITION_INDEPENDENT_CODE ON)
 set_property(TARGET randomx-codegen PROPERTY CXX_STANDARD 11)
 
-if (NOT Threads_FOUND AND UNIX AND NOT APPLE)
+if(NOT Threads_FOUND AND UNIX AND NOT APPLE)
   set(THREADS_PREFER_PTHREAD_FLAG ON)
   find_package(Threads)
 endif()