Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unussed MMF from AUB tests 

Change-Id: Ia9ac7be967e423bca47242e3c51119cd4f3e4793
This commit is contained in:
Artur Harasimiuk 2018-03-29 20:49:21 +02:00 committed by sys_ocldev
parent 420bbd3954
commit 6e005f716c
10 changed files with 11 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unit_tests/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -25,7 +25,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/os_agnostic_memory_manager.h"
#include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/mocks/mock_context.h"
#include "test.h"
@ -34,7 +33,6 @@ using namespace OCLRT;
struct AUBCopyImage
: public CommandDeviceFixture,
public AUBCommandStreamFixture,
public MemoryManagementFixture,
public ::testing::WithParamInterface<std::tuple<uint32_t, uint32_t>>,
public ::testing::Test {
@ -46,7 +44,6 @@ struct AUBCopyImage
}
void SetUp() override {
MemoryManagementFixture::SetUp();
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
CommandStreamFixture::SetUp(pCmdQ);
context = new MockContext(pDevice);
@ -58,7 +55,6 @@ struct AUBCopyImage
delete context;
CommandStreamFixture::TearDown();
CommandDeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
MockContext *context;

6
unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -26,7 +26,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/os_agnostic_memory_manager.h"
#include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/mocks/mock_context.h"
#include "test.h"
#include <algorithm>
@ -96,7 +95,6 @@ struct FillChannelType {
struct AubFillImage
: public CommandDeviceFixture,
public AUBCommandStreamFixture,
public MemoryManagementFixture,
public ::testing::WithParamInterface<std::tuple<FillChannelType, uint32_t /*cl_channel_order*/, FillImageParams>>,
public ::testing::Test {
@ -108,7 +106,6 @@ struct AubFillImage
}
void SetUp() override {
MemoryManagementFixture::SetUp();
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
CommandStreamFixture::SetUp(pCmdQ);
context = new MockContext(pDevice);
@ -119,7 +116,6 @@ struct AubFillImage
delete context;
CommandStreamFixture::TearDown();
CommandDeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
MockContext *context;

6
unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -26,7 +26,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/os_agnostic_memory_manager.h"
#include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/mocks/mock_context.h"
#include "test.h"
@ -47,7 +46,6 @@ struct MapImageParams {
struct AUBMapImage
: public CommandDeviceFixture,
public AUBCommandStreamFixture,
public MemoryManagementFixture,
public ::testing::WithParamInterface<std::tuple<uint32_t /*cl_channel_type*/, uint32_t /*cl_channel_order*/, MapImageParams>>,
public ::testing::Test {
typedef AUBCommandStreamFixture CommandStreamFixture;
@ -58,7 +56,6 @@ struct AUBMapImage
}
void SetUp() override {
MemoryManagementFixture::SetUp();
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
CommandStreamFixture::SetUp(pCmdQ);
context = new MockContext(pDevice);
@ -69,7 +66,6 @@ struct AUBMapImage
delete context;
CommandStreamFixture::TearDown();
CommandDeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
MockContext *context;

6
unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -27,7 +27,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/os_agnostic_memory_manager.h"
#include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/mocks/mock_context.h"
#include "test.h"
@ -48,7 +47,6 @@ struct ReadImageParams {
struct AUBReadImage
: public CommandDeviceFixture,
public AUBCommandStreamFixture,
public MemoryManagementFixture,
public ::testing::WithParamInterface<std::tuple<uint32_t /*cl_channel_type*/, uint32_t /*cl_channel_order*/, ReadImageParams>>,
public ::testing::Test {
@ -57,7 +55,6 @@ struct AUBReadImage
using AUBCommandStreamFixture::SetUp;
void SetUp() override {
MemoryManagementFixture::SetUp();
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
CommandStreamFixture::SetUp(pCmdQ);
context = new MockContext(pDevice);
@ -68,7 +65,6 @@ struct AUBReadImage
delete context;
CommandStreamFixture::TearDown();
CommandDeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
MockContext *context;

6
unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -26,7 +26,6 @@
#include "runtime/mem_obj/image.h"
#include "runtime/memory_manager/os_agnostic_memory_manager.h"
#include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/mocks/mock_context.h"
#include "test.h"
@ -47,7 +46,6 @@ struct WriteImageParams {
struct AUBWriteImage
: public CommandDeviceFixture,
public AUBCommandStreamFixture,
public MemoryManagementFixture,
public ::testing::WithParamInterface<std::tuple<uint32_t /*cl_channel_type*/, uint32_t /*cl_channel_order*/, WriteImageParams>>,
public ::testing::Test {
typedef AUBCommandStreamFixture CommandStreamFixture;
@ -55,7 +53,6 @@ struct AUBWriteImage
using AUBCommandStreamFixture::SetUp;
void SetUp() override {
MemoryManagementFixture::SetUp();
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
CommandStreamFixture::SetUp(pCmdQ);
context = new MockContext(pDevice);
@ -66,7 +63,6 @@ struct AUBWriteImage
delete context;
CommandStreamFixture::TearDown();
CommandDeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
MockContext *context;

1
unit_tests/aub_tests/command_stream/aub_command_stream_fixture.cpp
View File

@ -32,7 +32,6 @@
namespace OCLRT {
void AUBCommandStreamFixture::SetUp(CommandQueue *pCmdQ) {
MemoryManagement::fastLeaksDetectionMode = MemoryManagement::LeakDetectionMode::TURN_OFF_LEAK_DETECTION;
ASSERT_NE(pCmdQ, nullptr);
auto &device = reinterpret_cast<MockDevice &>(pCmdQ->getDevice());

6
unit_tests/aub_tests/fixtures/fixture_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -25,7 +25,6 @@
#include "runtime/mem_obj/image.h"
#include "unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h"
#include "unit_tests/command_queue/command_enqueue_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/mocks/mock_context.h"
#include "gtest/gtest.h"
@ -33,13 +32,11 @@ using namespace OCLRT;
struct SimpleTest : public CommandDeviceFixture,
public AUBCommandStreamFixture,
public MemoryManagementFixture,
public ::testing::Test {
using AUBCommandStreamFixture::SetUp;
void SetUp() override {
MemoryManagementFixture::SetUp();
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
AUBCommandStreamFixture::SetUp(pCmdQ);
context = new MockContext(pDevice);
@ -48,7 +45,6 @@ struct SimpleTest : public CommandDeviceFixture,
delete context;
AUBCommandStreamFixture::TearDown();
CommandDeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
MockContext *context;
};

8
unit_tests/aub_tests/fixtures/run_kernel_fixture.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -30,7 +30,6 @@
#include "unit_tests/command_queue/command_queue_fixture.h"
#include "unit_tests/command_queue/command_enqueue_fixture.h"
#include "unit_tests/fixtures/run_kernel_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/global_environment.h"
#include "unit_tests/helpers/test_files.h"
@ -50,20 +49,17 @@ struct AUBRunKernelFixtureFactory : public RunKernelFixtureFactory {
// Used by most tests for integration testing with command queues.
////////////////////////////////////////////////////////////////////////////////
template <typename FixtureFactory>
class RunKernelFixture : public CommandEnqueueAUBFixture,
public MemoryManagementFixture {
class RunKernelFixture : public CommandEnqueueAUBFixture {
public:
RunKernelFixture() {
}
virtual void SetUp() {
MemoryManagementFixture::SetUp();
CommandEnqueueAUBFixture::SetUp();
}
virtual void TearDown() {
CommandEnqueueAUBFixture::TearDown();
MemoryManagementFixture::TearDown();
}
protected:

8
unit_tests/aub_tests/fixtures/simple_arg_fixture.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -29,7 +29,6 @@
#include "unit_tests/indirect_heap/indirect_heap_fixture.h"
#include "unit_tests/fixtures/simple_arg_fixture.h"
#include "unit_tests/fixtures/simple_arg_kernel_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
namespace OCLRT {
@ -51,8 +50,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
public FixtureFactory::CommandStreamFixture,
public FixtureFactory::CommandQueueFixture,
public FixtureFactory::KernelFixture,
public DeviceFixture,
public MemoryManagementFixture {
public DeviceFixture {
typedef typename FixtureFactory::IndirectHeapFixture IndirectHeapFixture;
typedef typename FixtureFactory::CommandStreamFixture CommandStreamFixture;
typedef typename FixtureFactory::CommandQueueFixture CommandQueueFixture;
@ -71,7 +69,6 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
public:
virtual void SetUp() {
MemoryManagementFixture::SetUp();
DeviceFixture::SetUp();
ASSERT_NE(nullptr, pDevice);
CommandQueueFixture::SetUp(pDevice, 0);
@ -109,7 +106,6 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
CommandStreamFixture::TearDown();
CommandQueueFixture::TearDown();
DeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
void *pDestMemory;

6
unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Intel Corporation
* Copyright (c) 2017 - 2018, Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -24,7 +24,6 @@
#include "runtime/memory_manager/os_agnostic_memory_manager.h"
#include "runtime/helpers/aligned_memory.h"
#include "unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/command_queue/command_enqueue_fixture.h"
#include "test.h"
#include "unit_tests/mocks/mock_gmm.h"
@ -42,7 +41,6 @@ static cl_mem_object_type ImgArrayTypes[] = {
struct AUBCreateImage
: public CommandDeviceFixture,
public AUBCommandStreamFixture,
public MemoryManagementFixture,
public ::testing::Test {
typedef AUBCommandStreamFixture CommandStreamFixture;
@ -52,7 +50,6 @@ struct AUBCreateImage
}
void SetUp() override {
MemoryManagementFixture::SetUp();
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
CommandStreamFixture::SetUp(pCmdQ);
@ -76,7 +73,6 @@ struct AUBCreateImage
//delete context;
CommandStreamFixture::TearDown();
CommandDeviceFixture::TearDown();
MemoryManagementFixture::TearDown();
}
//MockContext *context;