diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8c0e3bac86..cc784e51be 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -19,7 +19,6 @@ jobs: build_type: [Debug, Release] compiler: [{c: gcc, cxx: g++}] libbacktrace: ['-DVAL_USE_LIBBACKTRACE_BACKTRACE=OFF'] - pool_tracking: ['-DUMF_ENABLE_POOL_TRACKING=ON', '-DUMF_ENABLE_POOL_TRACKING=OFF'] latency_tracking: ['-DUR_ENABLE_LATENCY_HISTOGRAM=OFF'] include: - os: 'ubuntu-22.04' @@ -96,7 +95,6 @@ jobs: -DUR_DPCXX=${{github.workspace}}/dpcpp_compiler/bin/clang++ -DUR_CONFORMANCE_TEST_LOADER=OFF ${{matrix.libbacktrace}} - ${{matrix.pool_tracking}} ${{matrix.latency_tracking}} - name: Configure CMake @@ -114,7 +112,6 @@ jobs: -DUR_FORMAT_CPP_STYLE=OFF -DUR_DEVELOPER_MODE=OFF ${{matrix.libbacktrace}} - ${{matrix.pool_tracking}} ${{matrix.latency_tracking}} - name: Build @@ -127,7 +124,7 @@ jobs: - name: Test working-directory: ${{github.workspace}}/build - run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace" + run: ctest -C ${{matrix.build_type}} --output-on-failure -L "loader|validation|tracing|unit|urtrace" fuzztest: name: Fuzz tests short @@ -278,7 +275,7 @@ jobs: - name: Test working-directory: ${{github.workspace}}/build - run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace" + run: ctest -C ${{matrix.build_type}} --output-on-failure -L "loader|validation|tracing|unit|urtrace" macos-build: name: Build - MacOS @@ -309,6 +306,6 @@ jobs: -DCMAKE_BUILD_TYPE=Release -DUR_BUILD_TESTS=ON -DUR_FORMAT_CPP_STYLE=ON - -DUMF_ENABLE_POOL_TRACKING=ON + - name: Build run: cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fdc5d0c0c0..ce08978c3e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -37,7 +37,7 @@ jobs: sudo apt-get install -y libhwloc-dev - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON -DUR_ENABLE_TRACING=ON -DUR_BUILD_TOOLS=ON -DUMF_ENABLE_POOL_TRACKING=ON + run: cmake -B ${{github.workspace}}/build -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON -DUR_ENABLE_TRACING=ON -DUR_BUILD_TOOLS=ON - name: Build run: cmake --build ${{github.workspace}}/build -j $(nproc) @@ -72,7 +72,7 @@ jobs: - name: Configure CMake env: VCPKG_PATH: "C:/vcpkg/packages/hwloc_x64-windows" - run: cmake -B ${{github.workspace}}/build -DCMAKE_POLICY_DEFAULT_CMP0094=NEW -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON -DUR_ENABLE_TRACING=ON -DUR_BUILD_TOOLS=ON -DUMF_ENABLE_POOL_TRACKING=ON -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" + run: cmake -B ${{github.workspace}}/build -DCMAKE_POLICY_DEFAULT_CMP0094=NEW -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON -DUR_ENABLE_TRACING=ON -DUR_BUILD_TOOLS=ON -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" - name: Build run: cmake --build ${{github.workspace}}/build -j $(nproc) --config Release diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index ba0230d600..b9886cb4ca 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -45,7 +45,6 @@ jobs: -DUR_ENABLE_TRACING=ON -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON - -DUMF_ENABLE_POOL_TRACKING=ON -DUR_FORMAT_CPP_STYLE=ON -DCMAKE_BUILD_TYPE=Debug -DUR_BUILD_ADAPTER_L0=ON diff --git a/CMakeLists.txt b/CMakeLists.txt index ae0b42ee97..621e06fce2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,6 @@ option(UR_ENABLE_TRACING "enable api tracing through xpti" OFF) option(UR_ENABLE_SANITIZER "enable device sanitizer" ON) option(UR_ENABLE_SYMBOLIZER "enable symoblizer for sanitizer" OFF) option(UMF_BUILD_SHARED_LIBRARY "Build UMF as shared library" ON) -option(UMF_ENABLE_POOL_TRACKING "Build UMF with pool tracking" ON) option(UR_BUILD_ADAPTER_L0 "Build the Level-Zero adapter" OFF) option(UR_BUILD_ADAPTER_OPENCL "Build the OpenCL adapter" OFF) option(UR_BUILD_ADAPTER_CUDA "Build the CUDA adapter" OFF) diff --git a/source/adapters/cuda/CMakeLists.txt b/source/adapters/cuda/CMakeLists.txt index b6b153a5d8..f3927e90e2 100644 --- a/source/adapters/cuda/CMakeLists.txt +++ b/source/adapters/cuda/CMakeLists.txt @@ -72,12 +72,6 @@ else() ) endif() -if(UMF_ENABLE_POOL_TRACKING) - target_compile_definitions("ur_adapter_cuda" PRIVATE UMF_ENABLE_POOL_TRACKING) -else() - message(WARNING "CUDA adapter USM pools are disabled, set UMF_ENABLE_POOL_TRACKING to enable them") -endif() - if (UR_ENABLE_TRACING) include(FindCUDACupti) # The following two ifs can be removed when FindCUDA -> FindCUDAToolkit. diff --git a/source/adapters/cuda/usm.cpp b/source/adapters/cuda/usm.cpp index 8a6ac41b08..d8d26410fa 100644 --- a/source/adapters/cuda/usm.cpp +++ b/source/adapters/cuda/usm.cpp @@ -442,8 +442,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolCreate( ///< ::ur_usm_pool_limits_desc_t ur_usm_pool_handle_t *Pool ///< [out] pointer to USM memory pool ) { - // Without pool tracking we can't free pool allocations. -#ifdef UMF_ENABLE_POOL_TRACKING if (PoolDesc->flags & UR_USM_POOL_FLAG_ZERO_INITIALIZE_BLOCK) { return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } @@ -454,12 +452,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolCreate( return Ex.getError(); } return UR_RESULT_SUCCESS; -#else - std::ignore = Context; - std::ignore = PoolDesc; - std::ignore = Pool; - return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; -#endif } UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolRetain( diff --git a/source/adapters/hip/usm.cpp b/source/adapters/hip/usm.cpp index 5e28f3592d..8c6467b98c 100644 --- a/source/adapters/hip/usm.cpp +++ b/source/adapters/hip/usm.cpp @@ -385,8 +385,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolCreate( ///< ::ur_usm_pool_limits_desc_t ur_usm_pool_handle_t *Pool ///< [out] pointer to USM memory pool ) { - // Without pool tracking we can't free pool allocations. -#ifdef UMF_ENABLE_POOL_TRACKING if (PoolDesc->flags & UR_USM_POOL_FLAG_ZERO_INITIALIZE_BLOCK) { return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; } @@ -397,12 +395,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolCreate( return Ex.getError(); } return UR_RESULT_SUCCESS; -#else - std::ignore = Context; - std::ignore = PoolDesc; - std::ignore = Pool; - return UR_RESULT_ERROR_UNSUPPORTED_FEATURE; -#endif } UR_APIEXPORT ur_result_t UR_APICALL urUSMPoolRetain(