From e6341f48bbf53bfabb09c2dfab5da709d8fa45c2 Mon Sep 17 00:00:00 2001 From: "Mrozek, Michal" Date: Tue, 17 Sep 2019 11:28:35 -0700 Subject: [PATCH] Add extra settings file Change-Id: I49757d38a76cf7e3ae5357477296a4d4e6dcc84e Signed-off-by: Mrozek, Michal --- offline_compiler/CMakeLists.txt | 1 + offline_compiler/extra_settings.cpp | 14 ++++++++++++++ offline_compiler/offline_compiler.cpp | 1 + offline_compiler/offline_compiler.h | 1 + unit_tests/built_ins/built_in_tests.cpp | 12 ++++++++++++ .../enqueue_read_buffer_rect_tests.cpp | 3 +++ .../enqueue_write_buffer_rect_tests.cpp | 5 +++++ unit_tests/mem_obj/buffer_tests.cpp | 6 ++++++ ...e_read_write_buffer_scenarios_windows_tests.cpp | 3 +++ 9 files changed, 46 insertions(+) create mode 100644 offline_compiler/extra_settings.cpp diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt index e8b54c7174..3344634be9 100644 --- a/offline_compiler/CMakeLists.txt +++ b/offline_compiler/CMakeLists.txt @@ -23,6 +23,7 @@ set(CLOC_SRCS_LIB ${IGDRCL_SOURCE_DIR}/offline_compiler/multi_command.cpp ${IGDRCL_SOURCE_DIR}/offline_compiler/multi_command.h ${IGDRCL_SOURCE_DIR}/offline_compiler/options.cpp + ${IGDRCL_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp ${IGDRCL_SOURCE_DIR}/runtime/compiler_interface/create_main.cpp ${IGDRCL_SOURCE_DIR}/runtime/helpers/file_io.cpp ${IGDRCL_SOURCE_DIR}/runtime/helpers/hw_info.cpp diff --git a/offline_compiler/extra_settings.cpp b/offline_compiler/extra_settings.cpp new file mode 100644 index 0000000000..7a04f44342 --- /dev/null +++ b/offline_compiler/extra_settings.cpp @@ -0,0 +1,14 @@ +/* + * Copyright (C) 2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "runtime/os_interface/os_library.h" + +#include "offline_compiler.h" + +namespace NEO { +void OfflineCompiler::resolveExtraSettings() {} +} // namespace NEO diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp index e56b84fb1d..0358d267f4 100644 --- a/offline_compiler/offline_compiler.cpp +++ b/offline_compiler/offline_compiler.cpp @@ -565,6 +565,7 @@ void OfflineCompiler::setStatelessToStatefullBufferOffsetFlag() { void OfflineCompiler::parseDebugSettings() { setStatelessToStatefullBufferOffsetFlag(); + resolveExtraSettings(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/offline_compiler/offline_compiler.h b/offline_compiler/offline_compiler.h index 6350176132..d81f620212 100644 --- a/offline_compiler/offline_compiler.h +++ b/offline_compiler/offline_compiler.h @@ -59,6 +59,7 @@ class OfflineCompiler { int initialize(size_t numArgs, const std::vector &allArgs); int parseCommandLine(size_t numArgs, const std::vector &allArgs); void setStatelessToStatefullBufferOffsetFlag(); + void resolveExtraSettings(); void parseDebugSettings(); void storeBinary(char *&pDst, size_t &dstSize, const void *pSrc, const size_t srcSize); int buildSourceCode(); diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index e374ccaaa4..1f2da9f2f8 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -493,6 +493,10 @@ HWTEST_F(BuiltInTests, givenKernelWithAuxTranslationRequiredWhenEnqueueCalledThe } HWTEST_F(BuiltInTests, givenAuxTranslationKernelWhenSettingKernelArgsThenSetValidMocs) { + if (this->pDevice->areSharedSystemAllocationsAllowed()) { + GTEST_SKIP(); + } + using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; MockAuxBuilInOp mockAuxBuiltInOp(*pBuiltIns, *pContext, *pDevice); @@ -546,6 +550,10 @@ HWTEST_F(BuiltInTests, givenAuxTranslationKernelWhenSettingKernelArgsThenSetVali } HWTEST_F(BuiltInTests, givenAuxToNonAuxTranslationWhenSettingSurfaceStateThenSetValidAuxMode) { + if (this->pDevice->areSharedSystemAllocationsAllowed()) { + GTEST_SKIP(); + } + using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; using AUXILIARY_SURFACE_MODE = typename RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE; @@ -588,6 +596,10 @@ HWTEST_F(BuiltInTests, givenAuxToNonAuxTranslationWhenSettingSurfaceStateThenSet } HWTEST_F(BuiltInTests, givenNonAuxToAuxTranslationWhenSettingSurfaceStateThenSetValidAuxMode) { + if (this->pDevice->areSharedSystemAllocationsAllowed()) { + GTEST_SKIP(); + } + using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; using AUXILIARY_SURFACE_MODE = typename RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE; diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp index 7cfbc7139e..11b26159ef 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -534,6 +534,9 @@ HWTEST_F(EnqueueReadBufferRectTest, givenInOrderQueueAndDstPtrEqualSrcPtrAndNonZ HWTEST_F(EnqueueReadWriteBufferRectDispatch, givenOffsetResultingInMisalignedPtrWhenEnqueueReadBufferRectForNon3DCaseIsCalledThenAddressInStateBaseAddressIsAlignedAndMatchesKernelDispatchInfoParams) { initializeFixture(); + if (device->areSharedSystemAllocationsAllowed()) { + GTEST_SKIP(); + } auto cmdQ = std::make_unique>(context.get(), device.get(), &properties); buffer->forceDisallowCPUCopy = true; diff --git a/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp index 3ad65e6454..11b2ebbda5 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -531,6 +531,11 @@ HWTEST_F(EnqueueWriteBufferRectTest, givenInOrderQueueAndDstPtrEqualSrcPtrAndNon HWTEST_F(EnqueueReadWriteBufferRectDispatch, givenOffsetResultingInMisalignedPtrWhenEnqueueWriteBufferRectForNon3DCaseIsCalledThenAddressInStateBaseAddressIsAlignedAndMatchesKernelDispatchInfoParams) { initializeFixture(); + + if (device->areSharedSystemAllocationsAllowed()) { + GTEST_SKIP(); + } + auto cmdQ = std::make_unique>(context.get(), device.get(), &properties); buffer->forceDisallowCPUCopy = true; diff --git a/unit_tests/mem_obj/buffer_tests.cpp b/unit_tests/mem_obj/buffer_tests.cpp index 7530fe7f2a..6c292c06af 100644 --- a/unit_tests/mem_obj/buffer_tests.cpp +++ b/unit_tests/mem_obj/buffer_tests.cpp @@ -1991,6 +1991,9 @@ class BufferL3CacheTests : public ::testing::TestWithParam { }; HWTEST_P(BufferL3CacheTests, givenMisalignedAndAlignedBufferWhenClEnqueueWriteImageThenL3CacheIsOn) { + if (ctx.getDevice(0)->areSharedSystemAllocationsAllowed()) { + GTEST_SKIP(); + } using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; CommandQueueHw cmdQ(&ctx, ctx.getDevice(0), nullptr); @@ -2022,6 +2025,9 @@ HWTEST_P(BufferL3CacheTests, givenMisalignedAndAlignedBufferWhenClEnqueueWriteIm } HWTEST_P(BufferL3CacheTests, givenMisalignedAndAlignedBufferWhenClEnqueueWriteBufferRectThenL3CacheIsOn) { + if (ctx.getDevice(0)->areSharedSystemAllocationsAllowed()) { + GTEST_SKIP(); + } using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; CommandQueueHw cmdQ(&ctx, ctx.getDevice(0), nullptr); diff --git a/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index 3ca1c41d36..e9137cf468 100644 --- a/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -78,6 +78,9 @@ struct EnqueueBufferWindowsTest : public HardwareParse, HWTEST_F(EnqueueBufferWindowsTest, givenMisalignedHostPtrWhenEnqueueReadBufferCalledThenStateBaseAddressAddressIsAlignedAndMatchesKernelDispatchInfoParams) { initializeFixture(); + if (device->areSharedSystemAllocationsAllowed()) { + GTEST_SKIP(); + } auto cmdQ = std::make_unique>(context.get(), device.get(), &properties); uint32_t memory[2] = {}; char *misalignedPtr = reinterpret_cast(memory) + 1;