Enable DG1 by default

Signed-off-by: Szymon Morek <[email protected]>

Author: smorek-intel

cmake/setup_platform_flags.cmake

@@ -7,7 +7,7 @@
 SET_FLAGS_FOR("GEN8" "BDW")
 SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL")
 SET_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL")
-SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS" "ADLP")
+SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS" "ADLP" "DG1")
 
 foreach(GEN_TYPE ${XEHP_AND_LATER_GENS})
   if(TESTS_${GEN_TYPE})

opencl/test/unit_test/os_interface/linux/CMakeLists.txt

@@ -57,14 +57,14 @@ if(NEO__LIBVA_FOUND)
   )
 endif()
 
-if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
+if(TESTS_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
   list(APPEND IGDRCL_SRCS_tests_os_interface_linux
        ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_helper_tests_dg1.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_prod_dg1.h
   )
 endif()
 
-if(SUPPORT_XE_HP_SDV AND "${BRANCH_TYPE}" STREQUAL "")
+if(TESTS_XE_HP_SDV AND "${BRANCH_TYPE}" STREQUAL "")
   list(APPEND IGDRCL_SRCS_tests_os_interface_linux
        ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_helper_tests_xe_hp_sdv.cpp
   )

opencl/test/unit_test/os_interface/linux/drm_mock_memory_info.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,8 +10,8 @@
 #include "shared/source/os_interface/linux/memory_info_impl.h"
 
 constexpr drm_i915_memory_region_info memoryRegions[2] = {
-    {{I915_MEMORY_CLASS_SYSTEM, 0}, 0, 0, 64 * GB, 0, {}},
-    {{I915_MEMORY_CLASS_DEVICE, 0}, 0, 0, 8 * GB, 0, {}}};
+    {{I915_MEMORY_CLASS_SYSTEM, 0}, 0, 64 * GB, 0, {}},
+    {{I915_MEMORY_CLASS_DEVICE, 0}, 0, 8 * GB, 0, {}}};
 
 struct MockMemoryInfo : public MemoryInfoImpl {
     MockMemoryInfo() : MemoryInfoImpl(memoryRegions, 2) {}

shared/source/os_interface/linux/local_memory_helper.h

@@ -40,7 +40,7 @@ class LocalMemoryHelperImpl : public LocalMemoryHelper {
         return &instance;
     }
     uint32_t createGemExt(Drm *drm, void *data, uint32_t dataSize, size_t allocSize, uint32_t &handle) override;
-    std::unique_ptr<uint8_t[]> translateIfRequired(uint8_t *dataQuery, int32_t length);
+    std::unique_ptr<uint8_t[]> translateIfRequired(uint8_t *dataQuery, int32_t length) override;
 };
 
 template <PRODUCT_FAMILY gfxProduct>