Disable osEnableLocalMemory on 32 bits

Change-Id: Id405a57064d17293ede48f82992ab1bde4f3b9ce

Author: HoppeMateusz

runtime/dll/windows/os_interface.cpp

@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/windows/os_interface.h"
-
 namespace OCLRT {
 
-bool OSInterface::osEnableLocalMemory = true;
+bool OSInterface::osEnableLocalMemory = true && is64bit;
 
 } // namespace OCLRT

unit_tests/CMakeLists.txt

@@ -31,6 +31,7 @@ add_custom_target(run_unit_tests ALL)
 
 set(IGDRCL_SRCS_tests_local
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/libult/os_interface.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h
   ${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp
 )

unit_tests/aub_tests/CMakeLists.txt

@@ -11,6 +11,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/common.cmake)
 list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
   ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
   $<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
   $<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
   $<TARGET_OBJECTS:igdrcl_libult>

unit_tests/libult/CMakeLists.txt

@@ -37,7 +37,6 @@ set(IGDRCL_SRCS_LIB_ULT
   ${IGDRCL_SOURCE_DIR}/unit_tests/utilities/debug_settings_reader_creator.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gfx_family.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gfx_family.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.cpp
 )
 
 set(IGDRCL_SRCS_LIB_ULT_WINDOWS

unit_tests/linux/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,6 +8,7 @@ set(IGDRCL_SRCS_linux_tests
   ${CMAKE_CURRENT_SOURCE_DIR}/linux_tests_configuration.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/main_linux.cpp
   ${IGDRCL_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
   ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/allocator_helper.cpp
   ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
 )
@@ -23,6 +24,7 @@ set(IGDRCL_SRCS_linux_dll_tests
   ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/drm_neo_create.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/options.cpp
   ${IGDRCL_SOURCE_DIR}/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
 )
 
 if(IGDRCL__LIBVA_FOUND)

unit_tests/mt_tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,6 +8,7 @@ project(igdrcl_mt_tests)
 
 add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
   ${IGDRCL_SOURCE_DIR}/unit_tests/ult_configuration.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
   $<TARGET_OBJECTS:igdrcl_libult>

unit_tests/tbx/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017-2018 Intel Corporation
+# Copyright (C) 2017-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -9,6 +9,7 @@ add_executable(igdrcl_tbx_tests
   ${CMAKE_CURRENT_SOURCE_DIR}/tbx_tests_configuration.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/dll/create_command_stream.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/os_interface.cpp
   ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp
   $<TARGET_OBJECTS:igdrcl_libult>
 )

unit_tests/windows/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -16,6 +16,7 @@ set(NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS
 add_executable(igdrcl_windows_dll_tests
   ${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
   ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
+  ${IGDRCL_SOURCE_DIR}/runtime/dll/windows/os_interface.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp
   ${IGDRCL_SOURCE_DIR}/unit_tests/ult_configuration.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp

unit_tests/windows/os_interface_tests.cpp

@@ -1,13 +1,14 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "runtime/memory_manager/memory_constants.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "test.h"
 
 TEST(osInterfaceTests, osInterfaceLocalMemoryEnabledByDefault) {
-    EXPECT_TRUE(OCLRT::OSInterface::osEnableLocalMemory);
+    EXPECT_EQ(is64bit, OCLRT::OSInterface::osEnableLocalMemory);
 }