3 files changed, 6 insertions, 30 deletions
diff --git a/backend/include/rcc/Tooling/BackendDriver.h b/backend/include/rcc/Tooling/BackendDriver.h
index f762c1e..7b62b6d 100644
--- a/backend/include/rcc/Tooling/BackendDriver.h
+++ b/backend/include/rcc/Tooling/BackendDriver.h
@@ -46,7 +46,6 @@ runBackend(CanonicalMIR Input, const TargetDescription &Target, const BackendInv
            MachinePassInstrumentation *Instrumentation = nullptr);
 
 [[nodiscard]] std::string_view spelling(BackendOutputKind Output) noexcept;
-[[nodiscard]] Expected<BackendOutputKind> parseBackendOutputKind(std::string_view Value);
 [[nodiscard]] ArtifactKind manifestArtifactKind(BackendOutputKind Output) noexcept;
 [[nodiscard]] Expected<ArtifactKind> cacheArtifactKind(BackendOutputKind Output);
 
diff --git a/backend/include/rcc/Tooling/BackendInvocation.h b/backend/include/rcc/Tooling/BackendInvocation.h
index db1c5d2..d61f038 100644
--- a/backend/include/rcc/Tooling/BackendInvocation.h
+++ b/backend/include/rcc/Tooling/BackendInvocation.h
@@ -3,6 +3,7 @@
 #ifndef RCC_TOOLING_BACKENDINVOCATION_H
 #define RCC_TOOLING_BACKENDINVOCATION_H
 
+#include "rcc/CodeGen/CommandFlags.h"
 #include "rcc/Support/Error.h"
 
 #include <cstdint>
@@ -25,26 +26,6 @@ inline constexpr std::string_view GenericOpcodeReferenceVersion = "rcc-generic-o
 inline constexpr std::string_view RV64GCTargetABILoweringVersion = "rcc-rv64gc-lp64d-v1";
 inline constexpr std::string_view CompilerBuildFingerprint = "rcc-backend-0.1.0-stage17";
 
-enum class RelocationModel : std::uint8_t {
-  Static,
-  PositionIndependent,
-};
-
-enum class CodeModel : std::uint8_t {
-  Small,
-  Medium,
-  Large,
-};
-
-enum class OptimizationLevel : std::uint8_t {
-  O0,
-  O1,
-  O2,
-  O3,
-  Os,
-  Oz,
-};
-
 enum class LayoutOwnership : std::uint8_t {
   NativeObject,
   CompilerFinalLayout,
@@ -74,14 +55,14 @@ struct BackendInvocation final {
   std::vector<std::string> Features;
   std::string ABI;
   std::string DataLayout;
-  RelocationModel Relocation = RelocationModel::PositionIndependent;
-  CodeModel Code = CodeModel::Small;
+  rcc::RelocationModel Relocation = rcc::RelocationModel::PositionIndependent;
+  rcc::CodeModel Code = rcc::CodeModel::Small;
   std::vector<BackendOption> TargetOptions;
   LayoutOwnership Layout = LayoutOwnership::NativeObject;
   std::string AssemblerFlavor;
   std::string AssemblerVersion;
   std::vector<BackendOption> AssemblerOptions;
-  OptimizationLevel Optimization = OptimizationLevel::O2;
+  rcc::OptimizationLevel Optimization = rcc::OptimizationLevel::O2;
   std::vector<std::string> PassPipeline{"default"};
   DeterminismOptions Determinism;
   std::optional<std::uint64_t> ActionFuel;
@@ -104,13 +85,7 @@ computeTargetDescriptionFingerprint(const TargetDescription &Target);
                                                     const BackendInvocation &Invocation,
                                                     std::string_view TargetFingerprint);
 
-[[nodiscard]] std::string_view spelling(RelocationModel Value) noexcept;
-[[nodiscard]] std::string_view spelling(CodeModel Value) noexcept;
-[[nodiscard]] std::string_view spelling(OptimizationLevel Value) noexcept;
 [[nodiscard]] std::string_view spelling(LayoutOwnership Value) noexcept;
-[[nodiscard]] Expected<RelocationModel> parseRelocationModel(std::string_view Value);
-[[nodiscard]] Expected<CodeModel> parseCodeModel(std::string_view Value);
-[[nodiscard]] Expected<OptimizationLevel> parseOptimizationLevel(std::string_view Value);
 [[nodiscard]] Expected<LayoutOwnership> parseLayoutOwnership(std::string_view Value);
 
 } // namespace tooling
diff --git a/backend/include/rcc/Tooling/PipelineDriver.h b/backend/include/rcc/Tooling/PipelineDriver.h
index d6c9f58..5d2dc45 100644
--- a/backend/include/rcc/Tooling/PipelineDriver.h
+++ b/backend/include/rcc/Tooling/PipelineDriver.h
@@ -36,6 +36,8 @@ enum class SnapshotPhase : std::uint8_t {
 };
 
 struct PipelineControls final {
+  std::optional<std::string> StartBefore;
+  std::optional<std::string> StartAfter;
   std::optional<std::string> StopBefore;
   std::optional<std::string> StopAfter;
   std::vector<std::string> PrintBefore;