From patchwork Sat Dec 11 16:57:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 15145 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 50FD4C3259 for ; Sat, 11 Dec 2021 16:56:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E5893608A4; Sat, 11 Dec 2021 17:56:38 +0100 (CET) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CD1A56089D for ; Sat, 11 Dec 2021 17:56:32 +0100 (CET) Received: (Authenticated sender: jacopo@jmondi.org) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 236252000B; Sat, 11 Dec 2021 16:56:31 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Sat, 11 Dec 2021 17:57:13 +0100 Message-Id: <20211211165714.23067-11-jacopo@jmondi.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211211165714.23067-1-jacopo@jmondi.org> References: <20211211165714.23067-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 10/11] test: fence: Add test for the Fence class X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a test for the Fence class by testing a Fence failure case, and by testing a successfully signalled fence capture cycle. Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- test/fence.cpp | 335 +++++++++++++++++++++++++++++++++++++++++++++++ test/meson.build | 1 + 2 files changed, 336 insertions(+) create mode 100644 test/fence.cpp -- 2.33.1 diff --git a/test/fence.cpp b/test/fence.cpp new file mode 100644 index 000000000000..343189b91c3d --- /dev/null +++ b/test/fence.cpp @@ -0,0 +1,335 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2021, Google Inc. + * + * fence.cpp - Fence test + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +#include "camera_test.h" +#include "test.h" + +using namespace std::chrono_literals; +using namespace libcamera; +using namespace std; + +class FenceTest : public CameraTest, public Test +{ +public: + FenceTest(); + +protected: + int init() override; + int run() override; + +private: + int validateExpiredRequest(Request *request); + int validateRequest(Request *request); + void requestComplete(Request *request); + void requestRequeue(Request *request); + + void signalFence(); + + std::unique_ptr fence_; + EventDispatcher *dispatcher_; + UniqueFD eventFd_; + UniqueFD eventFd2_; + Timer fenceTimer_; + + std::vector> requests_; + std::unique_ptr config_; + std::unique_ptr allocator_; + + Stream *stream_; + + bool expectedCompletionResult_ = true; + + unsigned int completedRequest_; + + unsigned int signalledRequestId_; + unsigned int expiredRequestId_; + unsigned int nbuffers_; + + int efd2_; + int efd_; +}; + +FenceTest::FenceTest() + : CameraTest("platform/vimc.0 Sensor B") +{ +} + +int FenceTest::init() +{ + /* Make sure the CameraTest constructor succeeded. */ + if (status_ != TestPass) + return status_; + + dispatcher_ = Thread::current()->eventDispatcher(); + + /* + * Create two eventfds to model the fences. This is enough to support the + * needs of libcamera which only needs to wait for read events through + * poll(). Once native support for fences will be available in the + * backend kernel APIs this will need to be replaced by a sw_sync fence, + * but that requires debugfs. + */ + eventFd_ = UniqueFD(eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK)); + eventFd2_ = UniqueFD(eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK)); + if (!eventFd_.isValid() || !eventFd2_.isValid()) { + cerr << "Unable to create eventfd" << endl; + return TestFail; + } + + efd_ = eventFd_.get(); + efd2_ = eventFd2_.get(); + + config_ = camera_->generateConfiguration({ StreamRole::Viewfinder }); + if (!config_ || config_->size() != 1) { + cerr << "Failed to generate default configuration" << endl; + return TestFail; + } + + if (camera_->acquire()) { + cerr << "Failed to acquire the camera" << endl; + return TestFail; + } + + if (camera_->configure(config_.get())) { + cerr << "Failed to set default configuration" << endl; + return TestFail; + } + + StreamConfiguration &cfg = config_->at(0); + stream_ = cfg.stream(); + + allocator_ = std::make_unique(camera_); + if (allocator_->allocate(stream_) < 0) + return TestFail; + + nbuffers_ = allocator_->buffers(stream_).size(); + if (nbuffers_ < 2) { + cerr << "Not enough buffers available" << endl; + return TestFail; + } + + signalledRequestId_ = nbuffers_ - 2; + expiredRequestId_ = nbuffers_ - 1; + + return TestPass; +} + +int FenceTest::validateExpiredRequest(Request *request) +{ + /* The last request is expected to fail. */ + if (request->status() != Request::RequestCancelled) { + cerr << "The last request should have failed: " << endl; + return TestFail; + } + + FrameBuffer *buffer = request->buffers().begin()->second; + std::unique_ptr fence = buffer->releaseFence(); + if (!fence) { + cerr << "The expired fence should be present" << endl; + return TestFail; + } + + if (!fence->isValid()) { + cerr << "The expired fence should be valid" << endl; + return TestFail; + } + + UniqueFD fd = fence->release(); + if (fd.get() != efd_) { + cerr << "The expired fence file descriptor should not change" << endl; + return TestFail; + } + + return TestPass; +} + +int FenceTest::validateRequest(Request *request) +{ + uint64_t cookie = request->cookie(); + + /* All requests but the last are expected to succeed. */ + if (request->status() != Request::RequestComplete) { + cerr << "Unexpected request failure: " << cookie << endl; + return TestFail; + } + + /* A successfully completed request should have the Fence closed. */ + const Request::BufferMap &buffers = request->buffers(); + FrameBuffer *buffer = buffers.begin()->second; + + std::unique_ptr bufferFence = buffer->releaseFence(); + if (bufferFence) { + cerr << "Unexpected valid fence in completed request" << endl; + return TestFail; + } + + return TestPass; +} + +void FenceTest::requestRequeue(Request *request) +{ + const Request::BufferMap &buffers = request->buffers(); + const Stream *stream = buffers.begin()->first; + FrameBuffer *buffer = buffers.begin()->second; + uint64_t cookie = request->cookie(); + + request->reuse(); + + if (cookie == signalledRequestId_) { + /* + * The second time this request is queued add a fence to it. + * + * The main loop signals it by using a timer to write to the + * efd2_ file descriptor before the fence expires. + */ + std::unique_ptr fence = + std::make_unique(std::move(eventFd2_)); + request->addBuffer(stream, buffer, std::move(fence)); + } else { + /* All the other requests continue to operate without fences. */ + request->addBuffer(stream, buffer); + } + + camera_->queueRequest(request); +} + +void FenceTest::requestComplete(Request *request) +{ + uint64_t cookie = request->cookie(); + completedRequest_ = cookie; + + /* + * The last request is expected to fail as its fence has not been + * signaled. + * + * Validate the fence status but do not re-queue it. + */ + if (cookie == expiredRequestId_) { + if (validateExpiredRequest(request) != TestPass) + expectedCompletionResult_ = false; + + dispatcher_->interrupt(); + return; + } + + /* Validate all requests but the last. */ + if (validateRequest(request) != TestPass) { + expectedCompletionResult_ = false; + + dispatcher_->interrupt(); + return; + } + + requestRequeue(request); + + /* + * Interrupt the dispatcher to return control to the main loop and + * activate the fenceTimer. + */ + dispatcher_->interrupt(); +} + +/* Callback to signal a fence waiting on the eventfd file descriptor. */ +void FenceTest::signalFence() +{ + uint64_t value = 1; + write(efd2_, &value, sizeof(value)); + dispatcher_->processEvents(); +} + +int FenceTest::run() +{ + for (const auto &[i, buffer] : utils::enumerate(allocator_->buffers(stream_))) { + std::unique_ptr request = camera_->createRequest(i); + if (!request) { + cerr << "Failed to create request" << endl; + return TestFail; + } + + int ret; + if (i == expiredRequestId_) { + /* This request will have a fence, and it will expire. */ + fence_ = std::make_unique(std::move(eventFd_)); + if (!fence_->isValid()) { + cerr << "Fence should be valid" << endl; + return TestFail; + } + + ret = request->addBuffer(stream_, buffer.get(), std::move(fence_)); + } else { + /* All other requests will have no Fence. */ + ret = request->addBuffer(stream_, buffer.get()); + } + + if (ret) { + cerr << "Failed to associate buffer with request" << endl; + return TestFail; + } + + requests_.push_back(std::move(request)); + } + + camera_->requestCompleted.connect(this, &FenceTest::requestComplete); + + if (camera_->start()) { + cerr << "Failed to start camera" << endl; + return TestFail; + } + + for (std::unique_ptr &request : requests_) { + if (camera_->queueRequest(request.get())) { + cerr << "Failed to queue request" << endl; + return TestFail; + } + } + + expectedCompletionResult_ = true; + + /* This timer serves to signal fences associated with "signalledRequestId_" */ + Timer fenceTimer; + fenceTimer.timeout.connect(this, &FenceTest::signalFence); + + /* Loop for one second. */ + Timer timer; + timer.start(1000); + while (timer.isRunning() && expectedCompletionResult_) { + if (completedRequest_ == signalledRequestId_) + /* + * signalledRequestId_ has just completed and it has + * been re-queued with a fence. Start the timer to + * signal the fence in 10 msec. + */ + fenceTimer.start(10); + + dispatcher_->processEvents(); + } + + camera_->requestCompleted.disconnect(); + + if (camera_->stop()) { + cerr << "Failed to stop camera" << endl; + return TestFail; + } + + return expectedCompletionResult_ ? TestPass : TestFail; +} + +TEST_REGISTER(FenceTest) diff --git a/test/meson.build b/test/meson.build index daaa3862cdd6..2c9487e203e2 100644 --- a/test/meson.build +++ b/test/meson.build @@ -39,6 +39,7 @@ internal_tests = [ ['event', 'event.cpp'], ['event-dispatcher', 'event-dispatcher.cpp'], ['event-thread', 'event-thread.cpp'], + ['fence', 'fence.cpp'], ['file', 'file.cpp'], ['flags', 'flags.cpp'], ['hotplug-cameras', 'hotplug-cameras.cpp'],