Remove old test.
Change-Id: Ie44fc1d417138ba170d78642db302ccbaa8c9312
diff --git a/tests/BUILD.gn b/tests/BUILD.gn
index 9954076..7f08c22 100644
--- a/tests/BUILD.gn
+++ b/tests/BUILD.gn
@@ -37,7 +37,6 @@
]
deps = [
- "unit_tests",
"$mesa_build_root/src/util/tests/os_dirent",
"$mesa_build_root/src/util/tests/inflight_list",
"$mesa_build_root/src/util/tests/futex",
diff --git a/tests/unit_tests/BUILD.gn b/tests/unit_tests/BUILD.gn
deleted file mode 100644
index cff0a28..0000000
--- a/tests/unit_tests/BUILD.gn
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 Google, LLC
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-import("../../mesa.gni")
-
-source_set("unit_tests") {
- testonly = true
-
- sources = []
-
- deps = [
- "$magma_build_root/include:magma_abi",
- "$magma_build_root/src/magma_util/platform:buffer",
- "$magma_build_root/tests/mock:magma_system",
- "//third_party/googletest:gtest",
- ]
-}
diff --git a/tests/unit_tests/test_drm_command_buffer.cc b/tests/unit_tests/test_drm_command_buffer.cc
deleted file mode 100644
index 10ccad3..0000000
--- a/tests/unit_tests/test_drm_command_buffer.cc
+++ /dev/null
@@ -1,163 +0,0 @@
-#include "drm_command_buffer.h"
-#include "magma.h"
-#include "gtest/gtest.h"
-#include <vector>
-
-class Buffer {
-public:
- Buffer(magma_connection_t connection, magma_buffer_t handle, uint64_t size)
- : connection_(connection), handle_(handle), size_(size)
- {
- }
- ~Buffer() { magma_release_buffer(connection_, handle_); }
-
- uint64_t size() { return size_; }
- uint64_t id() { return magma_get_buffer_id(handle_); }
- magma_buffer_t handle() { return handle_; }
-
-private:
- magma_connection_t connection_;
- magma_buffer_t handle_;
- uint64_t size_;
-};
-
-class TestDrmCommandBuffer {
-public:
- TestDrmCommandBuffer() { magma_create_connection(0, &connection_); }
-
- ~TestDrmCommandBuffer() { magma_release_connection(connection_); }
-
- void NoBuffers()
- {
- drm_i915_gem_execbuffer2 execbuffer2 = {
- .buffers_ptr = reinterpret_cast<uint64_t>(nullptr),
- .buffer_count = 0,
- .batch_start_offset = 0,
- .batch_len = 0, // not used
- .flags = I915_EXEC_HANDLE_LUT,
- };
-
- uint64_t size = DrmCommandBuffer::RequiredSize(&execbuffer2, 0);
- EXPECT_EQ(sizeof(magma_system_command_buffer), size);
-
- std::vector<uint8_t> buffer(size);
- std::vector<uint64_t> buffer_ids;
- std::vector<uint64_t> wait_semaphores;
- std::vector<uint64_t> signal_semaphores;
-
- EXPECT_TRUE(DrmCommandBuffer::Translate(&execbuffer2, buffer_ids, wait_semaphores,
- signal_semaphores, buffer.data()));
-
- auto command_buffer = reinterpret_cast<magma_system_command_buffer*>(buffer.data());
- EXPECT_EQ(-1, (int)command_buffer->batch_buffer_resource_index);
- EXPECT_EQ(0u, command_buffer->batch_start_offset);
- EXPECT_EQ(0u, command_buffer->num_resources);
- EXPECT_EQ(0u, command_buffer->wait_semaphore_count);
- EXPECT_EQ(0u, command_buffer->signal_semaphore_count);
- }
-
- std::unique_ptr<Buffer> CreateBuffer(uint64_t size)
- {
- magma_buffer_t handle;
- if (magma_create_buffer(connection_, size, &size, &handle) != 0)
- return DRETP(nullptr, "magma_system_alloc failed");
- return std::make_unique<Buffer>(connection_, handle, size);
- }
-
- void WithBuffers(uint32_t wait_semaphore_count, uint32_t signal_semaphore_count)
- {
- std::vector<std::unique_ptr<Buffer>> buffers;
-
- buffers.push_back(CreateBuffer(PAGE_SIZE));
- buffers.push_back(CreateBuffer(PAGE_SIZE));
-
- std::vector<uint64_t> wait_semaphore_ids;
- for (uint32_t i = 0; i < wait_semaphore_count; i++) {
- wait_semaphore_ids.push_back(10 + i);
- }
- std::vector<uint64_t> signal_semaphore_ids;
- for (uint32_t i = 0; i < signal_semaphore_count; i++) {
- signal_semaphore_ids.push_back(100 + i);
- }
-
- std::vector<drm_i915_gem_exec_object2> exec_res;
-
- exec_res.push_back({
- .handle = buffers[0]->handle(),
- .relocation_count = 0,
- .relocs_ptr = 0,
- .alignment = 0,
- .offset = 0,
- .flags = 0,
- .rsvd1 = 10, // offset
- .rsvd2 = buffers[0]->size() - 10, // length
- });
-
- exec_res.push_back({
- .handle = buffers[1]->handle(),
- .relocation_count = 0,
- .relocs_ptr = 0,
- .alignment = 0,
- .offset = 0,
- .flags = 0,
- .rsvd1 = 20, // offset
- .rsvd2 = buffers[1]->size() - 20, // length
- });
-
- drm_i915_gem_execbuffer2 exec_buffer = {
- .buffers_ptr = reinterpret_cast<uint64_t>(exec_res.data()),
- .buffer_count = static_cast<uint32_t>(exec_res.size()),
- .batch_start_offset = static_cast<uint32_t>(buffers[1]->size()) / 2,
- .batch_len = 0, // not used
- .flags = I915_EXEC_HANDLE_LUT,
- };
-
- const uint64_t size = DrmCommandBuffer::RequiredSize(
- &exec_buffer, wait_semaphore_ids.size() + signal_semaphore_ids.size());
- uint64_t expected_size =
- sizeof(magma_system_command_buffer) +
- (wait_semaphore_ids.size() + signal_semaphore_ids.size()) * sizeof(uint64_t) +
- sizeof(magma_system_exec_resource) * exec_res.size();
- EXPECT_EQ(expected_size, size);
-
- std::vector<uint64_t> buffer_ids;
- buffer_ids.push_back(buffers[0]->id());
- buffer_ids.push_back(buffers[1]->id());
-
- std::vector<uint8_t> buffer(size);
- EXPECT_TRUE(DrmCommandBuffer::Translate(&exec_buffer, buffer_ids, wait_semaphore_ids,
- signal_semaphore_ids, buffer.data()));
-
- auto command_buffer = reinterpret_cast<magma_system_command_buffer*>(buffer.data());
- EXPECT_EQ(exec_buffer.buffer_count - 1, command_buffer->batch_buffer_resource_index);
- EXPECT_EQ(exec_buffer.batch_start_offset, command_buffer->batch_start_offset);
- EXPECT_EQ(exec_buffer.buffer_count, command_buffer->num_resources);
- EXPECT_EQ(wait_semaphore_ids.size(), command_buffer->wait_semaphore_count);
- EXPECT_EQ(signal_semaphore_ids.size(), command_buffer->signal_semaphore_count);
-
- auto semaphores = reinterpret_cast<uint64_t*>(command_buffer + 1);
- for (uint32_t i = 0; i < wait_semaphore_count; i++) {
- EXPECT_EQ(wait_semaphore_ids[i], semaphores[i]);
- }
- semaphores += wait_semaphore_count;
- for (uint32_t i = 0; i < signal_semaphore_count; i++) {
- EXPECT_EQ(signal_semaphore_ids[i], semaphores[i]);
- }
-
- auto exec_resource =
- reinterpret_cast<magma_system_exec_resource*>(semaphores + signal_semaphore_count);
- for (uint32_t i = 0; i < exec_res.size(); i++) {
- EXPECT_EQ(exec_resource->buffer_id, buffers[i]->id());
- EXPECT_EQ(exec_resource->offset, exec_res[i].rsvd1);
- EXPECT_EQ(exec_resource->length, exec_res[i].rsvd2);
- exec_resource++;
- }
- }
-
-private:
- magma_connection_t connection_;
-};
-
-TEST(DrmCommandBuffer, NoBuffers) { TestDrmCommandBuffer().NoBuffers(); }
-
-TEST(DrmCommandBuffer, SomeBuffers) { TestDrmCommandBuffer().WithBuffers(1, 2); }
