From 51b170b470ed587f99a7c2a773e4464687f0d07a Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 4 Aug 2025 04:50:14 +0200 Subject: [cmake] refactor: Use CPM over submodules (#143) Transfers the majority of submodules and large externals to CPM, using source archives rather than full Git clones. Not only does this save massive amounts of clone and configure time, but dependencies are grabbed on-demand rather than being required by default. Additionally, CPM will (generally) automatically search for system dependencies, though certain dependencies have options to control this. Testing shows gains ranging from 5x to 10x in terms of overall clone/configure time. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/143 Reviewed-by: CamilleLaVey --- externals/sirit/src/sirit.cpp | 142 ------------------------------------------ 1 file changed, 142 deletions(-) delete mode 100644 externals/sirit/src/sirit.cpp (limited to 'externals/sirit/src/sirit.cpp') diff --git a/externals/sirit/src/sirit.cpp b/externals/sirit/src/sirit.cpp deleted file mode 100644 index 7075f23e15..0000000000 --- a/externals/sirit/src/sirit.cpp +++ /dev/null @@ -1,142 +0,0 @@ -/* This file is part of the sirit project. - * Copyright (c) 2019 sirit - * This software may be used and distributed according to the terms of the - * 3-Clause BSD License - */ - -#include - -#include "sirit/sirit.h" - -#include "common_types.h" -#include "stream.h" - -namespace Sirit { - -constexpr u32 MakeWord0(spv::Op op, size_t word_count) { - return static_cast(op) | static_cast(word_count) << 16; -} - -Module::Module(u32 version_) - : version{version_}, ext_inst_imports{std::make_unique(&bound)}, - entry_points{std::make_unique(&bound)}, - execution_modes{std::make_unique(&bound)}, debug{std::make_unique(&bound)}, - annotations{std::make_unique(&bound)}, declarations{std::make_unique( - &bound)}, - global_variables{std::make_unique(&bound)}, code{std::make_unique(&bound)} {} - -Module::~Module() = default; - -std::vector Module::Assemble() const { - std::vector words = {spv::MagicNumber, version, GENERATOR_MAGIC_NUMBER, bound + 1, 0}; - const auto insert = [&words](std::span input) { - words.insert(words.end(), input.begin(), input.end()); - }; - - words.reserve(words.size() + capabilities.size() * 2); - for (const spv::Capability capability : capabilities) { - insert(std::array{ - MakeWord0(spv::Op::OpCapability, 2), - static_cast(capability), - }); - } - - for (const std::string_view extension_name : extensions) { - size_t string_words = WordsInString(extension_name); - words.push_back(MakeWord0(spv::Op::OpExtension, string_words + 1)); - size_t insert_index = words.size(); - words.resize(words.size() + string_words); - InsertStringView(words, insert_index, extension_name); - } - - insert(ext_inst_imports->Words()); - - insert(std::array{ - MakeWord0(spv::Op::OpMemoryModel, 3), - static_cast(addressing_model), - static_cast(memory_model), - }); - - insert(entry_points->Words()); - insert(execution_modes->Words()); - insert(debug->Words()); - insert(annotations->Words()); - insert(declarations->Words()); - insert(global_variables->Words()); - insert(code->Words()); - - return words; -} - -void Module::PatchDeferredPhi(const std::function& func) { - for (const u32 phi_index : deferred_phi_nodes) { - const u32 first_word = code->Value(phi_index); - [[maybe_unused]] const spv::Op op = static_cast(first_word & 0xffff); - assert(op == spv::Op::OpPhi); - const u32 num_words = first_word >> 16; - const u32 num_args = (num_words - 3) / 2; - u32 cursor = phi_index + 3; - for (u32 arg = 0; arg < num_args; ++arg, cursor += 2) { - code->SetValue(cursor, func(arg).value); - } - } -} - -void Module::AddExtension(std::string extension_name) { - extensions.insert(std::move(extension_name)); -} - -void Module::AddCapability(spv::Capability capability) { - capabilities.insert(capability); -} - -void Module::SetMemoryModel(spv::AddressingModel addressing_model_, - spv::MemoryModel memory_model_) { - addressing_model = addressing_model_; - memory_model = memory_model_; -} - -void Module::AddEntryPoint(spv::ExecutionModel execution_model, Id entry_point, - std::string_view name, std::span interfaces) { - entry_points->Reserve(4 + WordsInString(name) + interfaces.size()); - *entry_points << spv::Op::OpEntryPoint << execution_model << entry_point << name << interfaces - << EndOp{}; -} - -void Module::AddExecutionMode(Id entry_point, spv::ExecutionMode mode, - std::span literals) { - execution_modes->Reserve(3 + literals.size()); - *execution_modes << spv::Op::OpExecutionMode << entry_point << mode << literals << EndOp{}; -} - -Id Module::AddLabel(Id label) { - assert(label.value != 0); - code->Reserve(2); - *code << MakeWord0(spv::Op::OpLabel, 2) << label.value; - return label; -} - -Id Module::AddLocalVariable(Id result_type, spv::StorageClass storage_class, - std::optional initializer) { - code->Reserve(5); - return *code << OpId{spv::Op::OpVariable, result_type} << storage_class << initializer - << EndOp{}; -} - -Id Module::AddGlobalVariable(Id result_type, spv::StorageClass storage_class, - std::optional initializer) { - global_variables->Reserve(5); - return *global_variables << OpId{spv::Op::OpVariable, result_type} << storage_class - << initializer << EndOp{}; -} - -Id Module::GetGLSLstd450() { - if (!glsl_std_450) { - ext_inst_imports->Reserve(3 + 4); - glsl_std_450 = *ext_inst_imports << OpId{spv::Op::OpExtInstImport} << "GLSL.std.450" - << EndOp{}; - } - return *glsl_std_450; -} - -} // namespace Sirit -- cgit v1.2.3