diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 0000000..48fdabc --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,56 @@ +name: CMake Build and Test + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build-and-test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Create Build Directory + run: mkdir build + + - name: Configure CMake + working-directory: ./build + run: cmake .. + + - name: Build Project + working-directory: ./build + run: make -j + + - name: Run Unittests + working-directory: ./build + run: ./unittests + + build-and-test-with-SDE: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Create Build Directory + run: mkdir build + + - name: Download and Unpack SDE + working-directory: ./build + run: | + wget https://downloadmirror.intel.com/859732/sde-external-9.58.0-2025-06-16-lin.tar.xz + tar xf sde-external-9.58.0-2025-06-16-lin.tar.xz + + - name: Configure CMake + working-directory: ./build + run: cmake .. -DMARCH=icelake-client + + - name: Build Project + working-directory: ./build + run: make -j + + - name: Run Unittests + working-directory: ./build + run: sde-external-9.58.0-2025-06-16-lin/sde64 -icl -emu-xinuse 0 -- ./unittests \ No newline at end of file diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml deleted file mode 100644 index 7ab1b4d..0000000 --- a/.github/workflows/cmake-multi-platform.yml +++ /dev/null @@ -1,75 +0,0 @@ -# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform. -# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml -name: CMake on multiple platforms - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - runs-on: ${{ matrix.os }} - - strategy: - # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable. - fail-fast: false - - # Set up a matrix to run the following 3 configurations: - # 1. - # 2. - # 3. - # - # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list. - matrix: - os: [ubuntu-latest, windows-latest] - build_type: [Release] - c_compiler: [gcc, clang, cl] - include: - - os: windows-latest - c_compiler: cl - cpp_compiler: cl - - os: ubuntu-latest - c_compiler: gcc - cpp_compiler: g++ - - os: ubuntu-latest - c_compiler: clang - cpp_compiler: clang++ - exclude: - - os: windows-latest - c_compiler: gcc - - os: windows-latest - c_compiler: clang - - os: ubuntu-latest - c_compiler: cl - - steps: - - uses: actions/checkout@v4 - - - name: Set reusable strings - # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file. - id: strings - shell: bash - run: | - echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: > - cmake -B ${{ steps.strings.outputs.build-output-dir }} - -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} - -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} - - - name: Build - # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). - run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} - - - name: Test - working-directory: ${{ steps.strings.outputs.build-output-dir }} - # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest --build-config ${{ matrix.build_type }} diff --git a/CMakeLists.txt b/CMakeLists.txt index b6beb6b..634a22d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,14 @@ cmake_minimum_required(VERSION 3.12) project(pixie) -set(CMAKE_CXX_FLAGS "-march=native") +set(MARCH "native" CACHE STRING "march compilier flag") +set(CMAKE_CXX_FLAGS "-march=${MARCH} -O3 -DNDEBUG") set(BENCHMARK_ENABLE_GTEST_TESTS OFF) include(FetchContent) FetchContent_Declare( googletest - GIT+REPOSITORY https://github.com/google/googletest.git + GIT_REPOSITORY https://github.com/google/googletest.git GIT_TAG v1.17.0 ) include(GoogleTest) @@ -44,5 +45,4 @@ target_link_libraries(unittests gtest gtest_main) -enable_testing() -gtest_discover_tests(unittests) +enable_testing() \ No newline at end of file diff --git a/include/bitvector.h b/include/bitvector.h index 6d742d8..c6ce83c 100644 --- a/include/bitvector.h +++ b/include/bitvector.h @@ -436,13 +436,13 @@ class BitVectorInterleaved { for (size_t j = 0; j < 7 && kWordSize * (i + j) < num_bits; ++j) { bits_interleaved[i * (kWordsPerBlock) + j] = bit_reader.ReadBits64( - std::min(64ull, num_bits - i * kBasicBlockSize + j * kWordSize)); + std::min(64ull, num_bits - i * kBasicBlockSize + j * kWordSize)); basic_block_sum += std::popcount(bits_interleaved[i * (kWordsPerBlock) + j]); } if ((i + 7) * kWordSize < num_bits) { auto v = bit_reader.ReadBits64( - std::min(48ull, num_bits - (i * kBasicBlockSize + 7 * kWordSize))); + std::min(48ull, num_bits - (i * kBasicBlockSize + 7 * kWordSize))); bits_interleaved[i * (kWordsPerBlock) + 7] ^= v; basic_block_sum += std::popcount(v); } diff --git a/src/unittests.cpp b/src/unittests.cpp index 53f16e2..3dab3e9 100644 --- a/src/unittests.cpp +++ b/src/unittests.cpp @@ -246,31 +246,7 @@ TEST(BitVectorTest, MainSelectTest) { } } -TEST(BitVectorTest, BenchmarkSelectTest) { - for (size_t n = 4; n <= (1ull << 34); n <<= 2) { - std::mt19937_64 rng(42); - std::vector bits(1 + n / 64); - for (auto &x : bits) { - x = rng(); - } - pixie::BitVector bv(bits, n); - - auto max_rank = bv.rank(bv.size()); - // size_t rank = 0; - auto r = bv.rank(bv.size()); - auto s = bv.select(r); - - // for (size_t i = 0; i < 10000 && r - i > 0; ++i) { - // s = bv.select(r - i); - // } - - for (size_t i = 0; i < 20000000; ++i) { - uint64_t rank = rng() % max_rank; - bv.select(rank); - } - } -} TEST(BitVectorInterleavedTest, AtTest) { std::mt19937_64 rng(42);