Fix for setting context flags in AubDump

Change-Id: Ia5fba17aac19fbcbfa6676557d1af0889f538b90

Author: pwilma

runtime/aub_mem_dump/aub_mem_dump.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "aub_mem_dump.h"
+#include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/debug_settings_manager.h"

runtime/command_stream/command_stream_receiver_simulated_common_hw.inl

@@ -85,10 +85,13 @@ void CommandStreamReceiverSimulatedCommonHw<GfxFamily>::setupContext(OsContext &
     CommandStreamReceiverHw<GfxFamily>::setupContext(osContext);
 
     engineIndex = getEngineIndex(osContext.getEngineType());
+    uint32_t flags = 0;
+    getCsTraits(osContext.getEngineType()).setContextSaveRestoreFlags(flags);
+
     auto &engineType = osContext.getEngineType();
     if (aubManager && !(engineType.type == lowPriorityGpgpuEngine.type && engineType.id == lowPriorityGpgpuEngine.id)) {
         hardwareContext = std::unique_ptr<aub_stream::HardwareContext>(aubManager->createHardwareContext(deviceIndex,
-                                                                                                         engineIndex));
+                                                                                                         engineIndex, flags));
     }
 }
 } // namespace OCLRT

third_party/aub_stream/headers/aub_manager.h

@@ -16,7 +16,7 @@ struct HardwareContext;
 class AubManager {
   public:
     virtual ~AubManager() = default;
-    virtual HardwareContext *createHardwareContext(uint32_t device, uint32_t engine) = 0;
+    virtual HardwareContext *createHardwareContext(uint32_t device, uint32_t engine, uint32_t flags) = 0;
     virtual void writeMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t memoryBanks, int hint, size_t pageSize) = 0;
 
     static AubManager *create(uint32_t gfxFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, const std::string &aubFileName, uint32_t streamMode);

unit_tests/aub/aub_helper_tests.inl

@@ -13,6 +13,7 @@
 #include "runtime/helpers/basic_math.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "unit_tests/mocks/mock_lrca_helper.h"
 #include "test.h"
 
 using namespace OCLRT;
@@ -127,15 +128,6 @@ HWTEST_F(AubHelperHwTest, GivenEnabledLocalMemoryWhenGetMemTraceForPtEntryIsCall
     EXPECT_EQ(AubMemDump::AddressSpaceValues::TraceLocal, addressSpace);
 }
 
-struct MockLrcaHelper : AubMemDump::LrcaHelper {
-    mutable uint32_t setContextSaveRestoreFlagsCalled = 0;
-    MockLrcaHelper(uint32_t base) : AubMemDump::LrcaHelper(base) {}
-    void setContextSaveRestoreFlags(uint32_t &value) const override {
-        setContextSaveRestoreFlagsCalled++;
-        AubMemDump::LrcaHelper::setContextSaveRestoreFlags(value);
-    }
-};
-
 HWTEST_F(AubHelperHwTest, giverLrcaHelperWhenContextIsInitializedThenContextFlagsAreSet) {
     const auto &csTraits = CommandStreamReceiverSimulatedCommonHw<FamilyType>::getCsTraits(EngineType::ENGINE_RCS);
     MockLrcaHelper lrcaHelper(csTraits.mmioBase);
@@ -144,4 +136,4 @@ HWTEST_F(AubHelperHwTest, giverLrcaHelperWhenContextIsInitializedThenContextFlag
 
     lrcaHelper.initialize(lrcaBase.get());
     ASSERT_NE(0u, lrcaHelper.setContextSaveRestoreFlagsCalled);
-}
+}

unit_tests/mocks/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -52,6 +52,7 @@ set(IGDRCL_SRCS_tests_mocks
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_image.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/mock_lrca_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime.h

unit_tests/mocks/mock_aub_manager.h

@@ -42,10 +42,15 @@ class MockAubManager : public aub_stream::AubManager {
     MockAubManager(){};
     ~MockAubManager() override {}
 
-    HardwareContext *createHardwareContext(uint32_t device, uint32_t engine) override { return new MockHardwareContext(device, engine); }
+    HardwareContext *createHardwareContext(uint32_t device, uint32_t engine) { return createHardwareContext(device, engine, 0); }
+    HardwareContext *createHardwareContext(uint32_t device, uint32_t engine, uint32_t flags) override {
+        contextFlags = flags;
+        return new MockHardwareContext(device, engine);
+    }
     void writeMemory(uint64_t gfxAddress, const void *memory, size_t size, uint32_t memoryBanks, int hint, size_t pageSize = 65536) override { writeMemoryCalled = true; }
 
     bool writeMemoryCalled = false;
+    uint32_t contextFlags = 0;
 
   protected:
     HardwareContext *hardwareContext = nullptr;

unit_tests/mocks/mock_lrca_helper.h

@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "runtime/aub_mem_dump/aub_mem_dump.h"
+
+struct MockLrcaHelper : AubMemDump::LrcaHelper {
+    mutable uint32_t setContextSaveRestoreFlagsCalled = 0;
+    MockLrcaHelper(uint32_t base) : AubMemDump::LrcaHelper(base) {}
+    void setContextSaveRestoreFlags(uint32_t &value) const override {
+        setContextSaveRestoreFlagsCalled++;
+        AubMemDump::LrcaHelper::setContextSaveRestoreFlags(value);
+    }
+};