diff --git a/src/shader_recompiler/CMakeLists.txt b/src/shader_recompiler/CMakeLists.txt index 151733090c..f20031d98d 100644 --- a/src/shader_recompiler/CMakeLists.txt +++ b/src/shader_recompiler/CMakeLists.txt @@ -22,8 +22,6 @@ add_library(shader_recompiler STATIC backend/spirv/emit_spirv_warp.cpp environment.h exception.h - file_environment.cpp - file_environment.h frontend/ir/attribute.cpp frontend/ir/attribute.h frontend/ir/basic_block.cpp @@ -178,9 +176,6 @@ add_library(shader_recompiler STATIC target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit) -add_executable(shader_util main.cpp) -target_link_libraries(shader_util PRIVATE shader_recompiler) - if (MSVC) target_compile_options(shader_recompiler PRIVATE /W4 @@ -213,4 +208,3 @@ else() endif() create_target_directory_groups(shader_recompiler) -create_target_directory_groups(shader_util) diff --git a/src/shader_recompiler/file_environment.cpp b/src/shader_recompiler/file_environment.cpp deleted file mode 100644 index f2104f444e..0000000000 --- a/src/shader_recompiler/file_environment.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include - -#include "exception.h" -#include "file_environment.h" - -namespace Shader { - -FileEnvironment::FileEnvironment(const char* path) { - std::FILE* const file{std::fopen(path, "rb")}; - if (!file) { - throw RuntimeError("Failed to open file='{}'", path); - } - std::fseek(file, 0, SEEK_END); - const long size{std::ftell(file)}; - std::rewind(file); - if (size % 8 != 0) { - std::fclose(file); - throw RuntimeError("File size={} is not aligned to 8", size); - } - // TODO: Use a unique_ptr to avoid zero-initializing this - const size_t num_inst{static_cast(size) / 8}; - data.resize(num_inst); - if (std::fread(data.data(), 8, num_inst, file) != num_inst) { - std::fclose(file); - throw RuntimeError("Failed to read instructions={} from file='{}'", num_inst, path); - } - std::fclose(file); -} - -FileEnvironment::~FileEnvironment() = default; - -u64 FileEnvironment::ReadInstruction(u32 offset) { - if (offset % 8 != 0) { - throw InvalidArgument("offset={} is not aligned to 8", offset); - } - if (offset / 8 >= static_cast(data.size())) { - throw InvalidArgument("offset={} is out of bounds", offset); - } - return data[offset / 8]; -} - -u32 FileEnvironment::TextureBoundBuffer() const { - throw NotImplementedException("Texture bound buffer serialization"); -} - -std::array FileEnvironment::WorkgroupSize() const { - return {1, 1, 1}; -} - -} // namespace Shader diff --git a/src/shader_recompiler/file_environment.h b/src/shader_recompiler/file_environment.h deleted file mode 100644 index 71601f8fd6..0000000000 --- a/src/shader_recompiler/file_environment.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include - -#include "common/common_types.h" -#include "shader_recompiler/environment.h" - -namespace Shader { - -class FileEnvironment : public Environment { -public: - explicit FileEnvironment(const char* path); - ~FileEnvironment() override; - - u64 ReadInstruction(u32 offset) override; - - u32 TextureBoundBuffer() const override; - - std::array WorkgroupSize() const override; - -private: - std::vector data; -}; - -} // namespace Shader diff --git a/src/shader_recompiler/main.cpp b/src/shader_recompiler/main.cpp deleted file mode 100644 index 72565f477a..0000000000 --- a/src/shader_recompiler/main.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright 2021 yuzu Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include -#include - -#include - -#include "shader_recompiler/backend/spirv/emit_spirv.h" -#include "shader_recompiler/file_environment.h" -#include "shader_recompiler/frontend/ir/basic_block.h" -#include "shader_recompiler/frontend/ir/ir_emitter.h" -#include "shader_recompiler/frontend/maxwell/control_flow.h" -#include "shader_recompiler/frontend/maxwell/decode.h" -#include "shader_recompiler/frontend/maxwell/location.h" -#include "shader_recompiler/frontend/maxwell/program.h" -#include "shader_recompiler/frontend/maxwell/translate/translate.h" - -using namespace Shader; -using namespace Shader::Maxwell; - -template -static void ForEachFile(const std::filesystem::path& path, Func&& func) { - std::filesystem::directory_iterator end; - for (std::filesystem::directory_iterator it{path}; it != end; ++it) { - if (std::filesystem::is_directory(*it)) { - ForEachFile(*it, func); - } else { - func(*it); - } - } -} - -void RunDatabase() { - std::vector> map; - ForEachFile("D:\\Shaders\\Database", [&](const std::filesystem::path& path) { - map.emplace_back(std::make_unique(path.string().c_str())); - }); - ObjectPool block_pool; - using namespace std::chrono; - auto t0 = high_resolution_clock::now(); - int N = 1; - int n = 0; - for (int i = 0; i < N; ++i) { - for (auto& env : map) { - ++n; - // fmt::print(stdout, "Decoding {}\n", path.string()); - - const Location start_address{0}; - block_pool.ReleaseContents(); - Flow::CFG cfg{*env, block_pool, start_address}; - // fmt::print(stdout, "{}\n", cfg->Dot()); - // IR::Program program{env, cfg}; - // Optimize(program); - // const std::string code{EmitGLASM(program)}; - } - } - auto t = high_resolution_clock::now(); - fmt::print(stdout, "{} ms", duration_cast(t - t0).count() / double(N)); -} - -static constexpr Profile PROFILE{ - .unified_descriptor_binding = true, - .support_float_controls = true, - .support_separate_denorm_behavior = true, - .support_separate_rounding_mode = true, - .support_fp16_denorm_preserve = true, - .support_fp32_denorm_preserve = true, - .support_fp16_denorm_flush = true, - .support_fp32_denorm_flush = true, -}; - -int main() { - // RunDatabase(); - - ObjectPool flow_block_pool; - ObjectPool inst_pool; - ObjectPool block_pool; - - // FileEnvironment env{"D:\\Shaders\\Database\\Oninaki\\CS8F146B41DB6BD826.bin"}; - FileEnvironment env{"D:\\Shaders\\shader.bin"}; - block_pool.ReleaseContents(); - inst_pool.ReleaseContents(); - flow_block_pool.ReleaseContents(); - Flow::CFG cfg{env, flow_block_pool, 0}; - fmt::print(stdout, "{}\n", cfg.Dot()); - IR::Program program{TranslateProgram(inst_pool, block_pool, env, cfg)}; - fmt::print(stdout, "{}\n", IR::DumpProgram(program)); - const std::vector spirv{Backend::SPIRV::EmitSPIRV(PROFILE, env, program)}; - std::FILE* const file{std::fopen("D:\\shader.spv", "wb")}; - std::fwrite(spirv.data(), spirv.size(), sizeof(u32), file); - std::fclose(file); - std::system("spirv-dis D:\\shader.spv"); -}