mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-14 15:46:28 +00:00
Factor utils::WireHelper out of DawnTest
This utility will be used to run tests on the wire in both the end2end tests and the unit tests. Bug: dawn:654 Change-Id: I5ac0b2385efe32ee1c4af033b01198f890c0f7dd Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/38500 Commit-Queue: Austin Eng <enga@chromium.org> Reviewed-by: Stephen White <senorblanco@chromium.org>
This commit is contained in:
committed by
Commit Bot service account
parent
0e64d527b3
commit
e58d5a36e1
@@ -82,9 +82,12 @@ static_library("dawn_utils") {
|
||||
"Timer.h",
|
||||
"WGPUHelpers.cpp",
|
||||
"WGPUHelpers.h",
|
||||
"WireHelper.cpp",
|
||||
"WireHelper.h",
|
||||
]
|
||||
deps = [
|
||||
"${dawn_root}/src/common",
|
||||
"${dawn_root}/src/dawn:dawn_proc",
|
||||
"${dawn_root}/src/dawn_native",
|
||||
"${dawn_root}/src/dawn_wire",
|
||||
"${dawn_shaderc_dir}:libshaderc",
|
||||
|
||||
@@ -34,12 +34,15 @@ target_sources(dawn_utils PRIVATE
|
||||
"Timer.h"
|
||||
"WGPUHelpers.cpp"
|
||||
"WGPUHelpers.h"
|
||||
"WireHelper.cpp"
|
||||
"WireHelper.h"
|
||||
)
|
||||
target_link_libraries(dawn_utils
|
||||
PUBLIC dawncpp_headers
|
||||
PRIVATE dawn_internal_config
|
||||
dawn_common
|
||||
dawn_native
|
||||
dawn_proc
|
||||
dawn_wire
|
||||
shaderc
|
||||
glfw
|
||||
|
||||
170
src/utils/WireHelper.cpp
Normal file
170
src/utils/WireHelper.cpp
Normal file
@@ -0,0 +1,170 @@
|
||||
// Copyright 2021 The Dawn Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "utils/WireHelper.h"
|
||||
|
||||
#include "common/Assert.h"
|
||||
#include "common/Log.h"
|
||||
#include "common/SystemUtils.h"
|
||||
#include "dawn/dawn_proc.h"
|
||||
#include "dawn_native/DawnNative.h"
|
||||
#include "dawn_wire/WireClient.h"
|
||||
#include "dawn_wire/WireServer.h"
|
||||
#include "utils/TerribleCommandBuffer.h"
|
||||
|
||||
#include <fstream>
|
||||
#include <iomanip>
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
|
||||
namespace utils {
|
||||
|
||||
namespace {
|
||||
|
||||
class WireServerTraceLayer : public dawn_wire::CommandHandler {
|
||||
public:
|
||||
WireServerTraceLayer(const char* dir, dawn_wire::CommandHandler* handler)
|
||||
: dawn_wire::CommandHandler(), mDir(dir), mHandler(handler) {
|
||||
const char* sep = GetPathSeparator();
|
||||
if (mDir.back() != *sep) {
|
||||
mDir += sep;
|
||||
}
|
||||
}
|
||||
|
||||
void BeginWireTrace(const char* name) {
|
||||
std::string filename = name;
|
||||
// Replace slashes in gtest names with underscores so everything is in one
|
||||
// directory.
|
||||
std::replace(filename.begin(), filename.end(), '/', '_');
|
||||
std::replace(filename.begin(), filename.end(), '\\', '_');
|
||||
|
||||
// Prepend the filename with the directory.
|
||||
filename = mDir + filename;
|
||||
|
||||
ASSERT(!mFile.is_open());
|
||||
mFile.open(filename,
|
||||
std::ios_base::out | std::ios_base::binary | std::ios_base::trunc);
|
||||
}
|
||||
|
||||
const volatile char* HandleCommands(const volatile char* commands,
|
||||
size_t size) override {
|
||||
if (mFile.is_open()) {
|
||||
mFile.write(const_cast<const char*>(commands), size);
|
||||
}
|
||||
return mHandler->HandleCommands(commands, size);
|
||||
}
|
||||
|
||||
private:
|
||||
std::string mDir;
|
||||
dawn_wire::CommandHandler* mHandler;
|
||||
std::ofstream mFile;
|
||||
};
|
||||
|
||||
class WireHelperDirect : public WireHelper {
|
||||
public:
|
||||
WireHelperDirect() {
|
||||
dawnProcSetProcs(&dawn_native::GetProcs());
|
||||
}
|
||||
|
||||
std::pair<wgpu::Device, WGPUDevice> RegisterDevice(WGPUDevice backendDevice) override {
|
||||
ASSERT(backendDevice != nullptr);
|
||||
return std::make_pair(wgpu::Device::Acquire(backendDevice), backendDevice);
|
||||
}
|
||||
|
||||
void BeginWireTrace(const char* name) override {
|
||||
}
|
||||
|
||||
bool FlushClient() override {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool FlushServer() override {
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
class WireHelperProxy : public WireHelper {
|
||||
public:
|
||||
explicit WireHelperProxy(const char* wireTraceDir) {
|
||||
mC2sBuf = std::make_unique<utils::TerribleCommandBuffer>();
|
||||
mS2cBuf = std::make_unique<utils::TerribleCommandBuffer>();
|
||||
|
||||
dawn_wire::WireServerDescriptor serverDesc = {};
|
||||
serverDesc.procs = &dawn_native::GetProcs();
|
||||
serverDesc.serializer = mS2cBuf.get();
|
||||
|
||||
mWireServer.reset(new dawn_wire::WireServer(serverDesc));
|
||||
mC2sBuf->SetHandler(mWireServer.get());
|
||||
|
||||
if (wireTraceDir != nullptr && strlen(wireTraceDir) > 0) {
|
||||
mWireServerTraceLayer.reset(
|
||||
new WireServerTraceLayer(wireTraceDir, mWireServer.get()));
|
||||
mC2sBuf->SetHandler(mWireServerTraceLayer.get());
|
||||
}
|
||||
|
||||
dawn_wire::WireClientDescriptor clientDesc = {};
|
||||
clientDesc.serializer = mC2sBuf.get();
|
||||
|
||||
mWireClient.reset(new dawn_wire::WireClient(clientDesc));
|
||||
mS2cBuf->SetHandler(mWireClient.get());
|
||||
dawnProcSetProcs(&dawn_wire::client::GetProcs());
|
||||
}
|
||||
|
||||
std::pair<wgpu::Device, WGPUDevice> RegisterDevice(WGPUDevice backendDevice) override {
|
||||
ASSERT(backendDevice != nullptr);
|
||||
|
||||
auto reservation = mWireClient->ReserveDevice();
|
||||
mWireServer->InjectDevice(backendDevice, reservation.id, reservation.generation);
|
||||
dawn_native::GetProcs().deviceRelease(backendDevice);
|
||||
|
||||
return std::make_pair(wgpu::Device::Acquire(reservation.device), backendDevice);
|
||||
}
|
||||
|
||||
void BeginWireTrace(const char* name) override {
|
||||
if (mWireServerTraceLayer) {
|
||||
return mWireServerTraceLayer->BeginWireTrace(name);
|
||||
}
|
||||
}
|
||||
|
||||
bool FlushClient() override {
|
||||
return mC2sBuf->Flush();
|
||||
}
|
||||
|
||||
bool FlushServer() override {
|
||||
return mS2cBuf->Flush();
|
||||
}
|
||||
|
||||
private:
|
||||
std::unique_ptr<utils::TerribleCommandBuffer> mC2sBuf;
|
||||
std::unique_ptr<utils::TerribleCommandBuffer> mS2cBuf;
|
||||
std::unique_ptr<WireServerTraceLayer> mWireServerTraceLayer;
|
||||
std::unique_ptr<dawn_wire::WireServer> mWireServer;
|
||||
std::unique_ptr<dawn_wire::WireClient> mWireClient;
|
||||
};
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
std::unique_ptr<WireHelper> CreateWireHelper(bool useWire, const char* wireTraceDir) {
|
||||
if (useWire) {
|
||||
return std::unique_ptr<WireHelper>(new WireHelperProxy(wireTraceDir));
|
||||
} else {
|
||||
return std::unique_ptr<WireHelper>(new WireHelperDirect());
|
||||
}
|
||||
}
|
||||
|
||||
WireHelper::~WireHelper() {
|
||||
dawnProcSetProcs(nullptr);
|
||||
}
|
||||
|
||||
} // namespace utils
|
||||
44
src/utils/WireHelper.h
Normal file
44
src/utils/WireHelper.h
Normal file
@@ -0,0 +1,44 @@
|
||||
// Copyright 2021 The Dawn Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#ifndef UTILS_WIREHELPER_H_
|
||||
#define UTILS_WIREHELPER_H_
|
||||
|
||||
#include "dawn/webgpu_cpp.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
|
||||
namespace utils {
|
||||
|
||||
class WireHelper {
|
||||
public:
|
||||
virtual ~WireHelper();
|
||||
|
||||
// Registers the device on the wire, if present.
|
||||
// Returns a pair of the client device and backend device.
|
||||
// The function should take ownership of |backendDevice|.
|
||||
virtual std::pair<wgpu::Device, WGPUDevice> RegisterDevice(WGPUDevice backendDevice) = 0;
|
||||
|
||||
virtual void BeginWireTrace(const char* name) = 0;
|
||||
|
||||
virtual bool FlushClient() = 0;
|
||||
virtual bool FlushServer() = 0;
|
||||
};
|
||||
|
||||
std::unique_ptr<WireHelper> CreateWireHelper(bool useWire, const char* wireTraceDir = nullptr);
|
||||
|
||||
} // namespace utils
|
||||
|
||||
#endif // UTILS_WIREHELPER_H_
|
||||
Reference in New Issue
Block a user