diff --git a/CMakeLists.txt b/CMakeLists.txt index cfecd6525d..1433d923a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,11 +117,15 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") set(NEO_TARGET_PROCESSOR "x86_64") elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") set(NEO_TARGET_PROCESSOR "aarch64") - set(NEO_DISABLE_LD_LLD TRUE) - set(NEO_DISABLE_LD_GOLD TRUE) + if(NOT ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_SYSTEM_PROCESSOR}) + set(NEO_DISABLE_LD_LLD TRUE) + set(NEO_DISABLE_LD_GOLD TRUE) + endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/sse2neon) endif() -message(STATUS "Target processor: ${NEO_TARGET_PROCESSOR}") +message(STATUS "Host processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}") +message(STATUS "Target processor: ${CMAKE_SYSTEM_PROCESSOR}") +message(STATUS "Neo target processor: ${NEO_TARGET_PROCESSOR}") if(NOT DEFINED NEO_TARGET_PROCESSOR) message(FATAL_ERROR "Unsupported target processor: ${CMAKE_SYSTEM_PROCESSOR}") diff --git a/manifests/manifest.yml b/manifests/manifest.yml index c6ecd1f8e9..002455d39f 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -20,7 +20,7 @@ components: infra: branch: master dest_dir: infra - revision: 62716a6834a70e2a0e2b30f7a39c67448687112f + revision: 3571b289849fc5cd4856bbc12f627bdc27f2a42f type: git internal: branch: master diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp index 8daba9ed75..7c7dbfcba6 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp @@ -9,6 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/direct_submission/dispatchers/render_dispatcher.h" #include "shared/source/helpers/flush_stamp.h" +#include "shared/source/utilities/cpu_info.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/fixtures/direct_submission_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" @@ -41,6 +42,10 @@ HWTEST_F(DirectSubmissionTest, whenDebugCacheFlushDisabledSetThenExpectNoCpuCach } HWTEST_F(DirectSubmissionTest, whenDebugCacheFlushDisabledNotSetThenExpectCpuCacheFlush) { + if (!CpuInfo::getInstance().isFeatureSupported(CpuInfo::featureClflush)) { + GTEST_SKIP(); + } + DebugManagerStateRestore restore; DebugManager.flags.DirectSubmissionDisableCpuCacheFlush.set(0);