diff --git a/.github/workflows/pr_push.yml b/.github/workflows/pr_push.yml index 9623b69f1b..2bffd338f1 100644 --- a/.github/workflows/pr_push.yml +++ b/.github/workflows/pr_push.yml @@ -16,75 +16,6 @@ permissions: contents: read jobs: - CodeChecks: - uses: ./.github/workflows/reusable_checks.yml - DocsBuild: - uses: ./.github/workflows/reusable_docs_build.yml - FastBuild: - name: Fast builds - needs: [CodeChecks, DocsBuild] - uses: ./.github/workflows/reusable_fast.yml - Build: - name: Basic builds - needs: [FastBuild] - uses: ./.github/workflows/reusable_basic.yml - DevDax: - needs: [FastBuild] - uses: ./.github/workflows/reusable_dax.yml - MultiNuma: - needs: [FastBuild] - uses: ./.github/workflows/reusable_multi_numa.yml - L0: - needs: [Build] - uses: ./.github/workflows/reusable_gpu.yml - with: - name: "LEVEL_ZERO" - shared_lib: "['ON']" - CUDA: - needs: [Build] - uses: ./.github/workflows/reusable_gpu.yml - with: - name: "CUDA" - shared_lib: "['ON']" - Sanitizers: - needs: [FastBuild] - uses: ./.github/workflows/reusable_sanitizers.yml - QEMU: - needs: [FastBuild] - uses: ./.github/workflows/reusable_qemu.yml - with: - short_run: true - Benchmarks: - needs: [Build] - uses: ./.github/workflows/reusable_benchmarks.yml ProxyLib: - needs: [Build] uses: ./.github/workflows/reusable_proxy_lib.yml - Valgrind: - needs: [Build] - uses: ./.github/workflows/reusable_valgrind.yml - Coverage: - # total coverage (on upstream only) - if: github.repository == 'oneapi-src/unified-memory-framework' - needs: [Build, DevDax, L0, CUDA, MultiNuma, QEMU, ProxyLib] - uses: ./.github/workflows/reusable_coverage.yml - secrets: inherit - with: - trigger: "${{github.event_name}}" - Coverage_partial: - # partial coverage (on forks) - if: github.repository != 'oneapi-src/unified-memory-framework' - needs: [Build, QEMU, ProxyLib] - uses: ./.github/workflows/reusable_coverage.yml - CodeQL: - needs: [Build] - permissions: - contents: read - security-events: write - uses: ./.github/workflows/reusable_codeql.yml - Trivy: - needs: [Build] - permissions: - contents: read - security-events: write - uses: ./.github/workflows/reusable_trivy.yml + \ No newline at end of file diff --git a/.github/workflows/reusable_proxy_lib.yml b/.github/workflows/reusable_proxy_lib.yml index 2a27161b3e..931ab6cc9c 100644 --- a/.github/workflows/reusable_proxy_lib.yml +++ b/.github/workflows/reusable_proxy_lib.yml @@ -65,6 +65,10 @@ jobs: working-directory: ${{env.BUILD_DIR}} run: LD_PRELOAD=./lib/libumf_proxy.so ctest --output-on-failure -E provider_file_memory_ipc + - name: aaa + working-directory: ${{env.BUILD_DIR}} + run: UMF_LOG="level:debug;flush:debug;output:stderr;pid:no" LD_PRELOAD=./lib/libumf_proxy.so ctest --output-on-failure -R disjointPool + - name: Run "./test/umf_test-memoryPool" with proxy library working-directory: ${{env.BUILD_DIR}} run: LD_PRELOAD=./lib/libumf_proxy.so ./test/umf_test-memoryPool diff --git a/test/memoryPoolAPI.cpp b/test/memoryPoolAPI.cpp index 1c6d83f2af..6d179a3718 100644 --- a/test/memoryPoolAPI.cpp +++ b/test/memoryPoolAPI.cpp @@ -284,7 +284,7 @@ TEST_F(test, getLastFailedMemoryProvider) { umf_result_t alloc(size_t size, size_t, void **ptr) noexcept { if (allocResult == UMF_RESULT_SUCCESS) { - *ptr = malloc(size); + *ptr = umf_ba_global_alloc(size); } else { *ptr = nullptr; } @@ -293,7 +293,7 @@ TEST_F(test, getLastFailedMemoryProvider) { } umf_result_t free(void *ptr, [[maybe_unused]] size_t size) noexcept { - ::free(ptr); + umf_ba_global_free(ptr); return UMF_RESULT_SUCCESS; } diff --git a/test/pools/disjoint_pool.cpp b/test/pools/disjoint_pool.cpp index 319997c823..f24d74d1d2 100644 --- a/test/pools/disjoint_pool.cpp +++ b/test/pools/disjoint_pool.cpp @@ -57,14 +57,14 @@ TEST_F(test, freeErrorPropagation) { static umf_result_t expectedResult = UMF_RESULT_SUCCESS; struct memory_provider : public umf_test::provider_base_t { umf_result_t alloc(size_t size, size_t, void **ptr) noexcept { - *ptr = malloc(size); + *ptr = umf_ba_global_alloc(size); return UMF_RESULT_SUCCESS; } umf_result_t free(void *ptr, [[maybe_unused]] size_t size) noexcept { // do the actual free only when we expect the success if (expectedResult == UMF_RESULT_SUCCESS) { - ::free(ptr); + umf_ba_global_free(ptr); } return expectedResult; } @@ -110,12 +110,12 @@ TEST_F(test, sharedLimits) { struct memory_provider : public umf_test::provider_base_t { umf_result_t alloc(size_t size, size_t, void **ptr) noexcept { - *ptr = malloc(size); + *ptr = umf_ba_global_alloc(size); numAllocs++; return UMF_RESULT_SUCCESS; } umf_result_t free(void *ptr, [[maybe_unused]] size_t size) noexcept { - ::free(ptr); + umf_ba_global_free(ptr); numFrees++; return UMF_RESULT_SUCCESS; }