Migrate the target folder structure (#154)

Move the mock target directory `mock_target` to `targets/systems/mock`.

This allows us to maintain various (and future) targets more easily.

Author: ibm-wakizaka

CMakeLists.txt

@@ -146,11 +146,11 @@ set(QSSC_TARGET_TEST_DIRS
 if(QSSC_WITH_MOCK_TARGET)
     set(QSSC_TARGET_DIRS
             ${QSSC_TARGET_DIRS}
-            ${CMAKE_CURRENT_SOURCE_DIR}/mock_target
+            ${CMAKE_CURRENT_SOURCE_DIR}/targets/systems/mock
     )
     set(QSSC_TARGET_TEST_DIRS
             ${QSSC_TARGET_TEST_DIRS}
-            ${CMAKE_CURRENT_SOURCE_DIR}/mock_target/test
+            ${CMAKE_CURRENT_SOURCE_DIR}/targets/systems/mock/test
     )
 endif()
 

mock_target/CMakeLists.txt renamed to targets/systems/mock/CMakeLists.txt

@@ -42,7 +42,7 @@
 
 using namespace mlir;
 
-namespace qssc::targets::mock::conversion {
+namespace qssc::targets::systems::mock::conversion {
 struct ReturnConversionPat : public OpConversionPattern<mlir::ReturnOp> {
 
   explicit ReturnConversionPat(MLIRContext *ctx, TypeConverter &typeConverter)
@@ -269,4 +269,4 @@ llvm::StringRef MockQUIRToStdPass::getDescription() const {
   return "Convert QUIR ops to std dialect";
 }
 
-} // namespace qssc::targets::mock::conversion
+} // namespace qssc::targets::systems::mock::conversion

mock_target/Conversion/QUIRToStandard/QUIRToStandard.cpp renamed to targets/systems/mock/Conversion/QUIRToStandard/QUIRToStandard.cpp

@@ -28,7 +28,7 @@
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
 
-namespace qssc::targets::mock::conversion {
+namespace qssc::targets::systems::mock::conversion {
 struct MockQUIRToStdPass
     : public mlir::PassWrapper<
           MockQUIRToStdPass,
@@ -44,6 +44,6 @@ struct MockQUIRToStdPass
   llvm::StringRef getArgument() const override;
   llvm::StringRef getDescription() const override;
 };
-} // namespace qssc::targets::mock::conversion
+} // namespace qssc::targets::systems::mock::conversion
 
 #endif // MOCK_CONVERSION_QUIRTOSTD_H

mock_target/Conversion/QUIRToStandard/QUIRToStandard.h renamed to targets/systems/mock/Conversion/QUIRToStandard/QUIRToStandard.h

@@ -55,7 +55,7 @@ using namespace mlir;
 using namespace mlir::quir;
 
 using namespace qssc::hal;
-using namespace qssc::targets::mock;
+using namespace qssc::targets::systems::mock;
 
 // The space below at the front of the string causes this category to be printed
 // first
@@ -64,7 +64,7 @@ static llvm::cl::OptionCategory
             "Options that control Mock-specific behavior of the Mock QSS "
             "Compiler target");
 
-int qssc::targets::mock::init() {
+int qssc::targets::systems::mock::init() {
   bool registered = registry::TargetSystemRegistry::registerPlugin<MockSystem>(
       "mock", "Mock system for testing the targeting infrastructure.",
       [](llvm::Optional<llvm::StringRef> configurationPath)
@@ -154,8 +154,8 @@ MockSystem::MockSystem(std::unique_ptr<MockConfig> config)
 } // MockSystem
 
 llvm::Error MockSystem::registerTargetPasses() {
-  mlir::PassRegistration<qssc::targets::mock::MockFunctionLocalizationPass>();
-  mlir::PassRegistration<qssc::targets::mock::MockQubitLocalizationPass>();
+  mlir::PassRegistration<MockFunctionLocalizationPass>();
+  mlir::PassRegistration<MockQubitLocalizationPass>();
   mlir::PassRegistration<conversion::MockQUIRToStdPass>(
       []() -> std::unique_ptr<conversion::MockQUIRToStdPass> {
         return std::make_unique<conversion::MockQUIRToStdPass>(false);

mock_target/MockTarget.cpp renamed to targets/systems/mock/MockTarget.cpp

@@ -29,7 +29,7 @@
 #include <memory>
 #include <unordered_map>
 
-namespace qssc::targets::mock {
+namespace qssc::targets::systems::mock {
 
 // Register the mock target.
 int init();
@@ -121,6 +121,6 @@ class MockDrive : public qssc::hal::TargetInstrument {
   auto getModule(mlir::ModuleOp topModuleOp) -> mlir::ModuleOp;
 }; // class MockDrive
 
-} // namespace qssc::targets::mock
+} // namespace qssc::targets::systems::mock
 
 #endif // HAL_TARGETS_MOCK_MOCKTARGET_H

mock_target/MockTarget.h renamed to targets/systems/mock/MockTarget.h

@@ -22,10 +22,10 @@
 
 #include <mlir/IR/BuiltinOps.h>
 
-using namespace qssc::targets::mock;
+using namespace qssc::targets::systems::mock;
 using namespace mlir;
 
-auto qssc::targets::mock::getControllerModule(ModuleOp topModuleOp)
+auto qssc::targets::systems::mock::getControllerModule(ModuleOp topModuleOp)
     -> ModuleOp {
   ModuleOp retOp = nullptr;
   topModuleOp->walk([&](ModuleOp walkOp) {
@@ -39,7 +39,7 @@ auto qssc::targets::mock::getControllerModule(ModuleOp topModuleOp)
   return retOp;
 }
 
-auto qssc::targets::mock::getActuatorModules(ModuleOp topModuleOp)
+auto qssc::targets::systems::mock::getActuatorModules(ModuleOp topModuleOp)
     -> std::vector<ModuleOp> {
   std::vector<ModuleOp> retVec;
   topModuleOp->walk([&](ModuleOp walkOp) {

mock_target/MockUtils.cpp renamed to targets/systems/mock/MockUtils.cpp

@@ -27,7 +27,7 @@ namespace mlir {
 class ModuleOp;
 } // end namespace mlir
 
-namespace qssc::targets::mock {
+namespace qssc::targets::systems::mock {
 
 // Looks for and returns the Controller submodule if it exists
 // Returns nullptr otherwise
@@ -36,6 +36,6 @@ auto getControllerModule(mlir::ModuleOp topModuleOp) -> mlir::ModuleOp;
 auto getActuatorModules(mlir::ModuleOp topModuleOp)
     -> std::vector<mlir::ModuleOp>;
 
-} // end namespace qssc::targets::mock
+} // namespace qssc::targets::systems::mock
 
 #endif // HAL_MOCKUTILS_H

mock_target/MockUtils.h renamed to targets/systems/mock/MockUtils.h

@@ -24,10 +24,10 @@
 
 #include "MockTarget.h"
 
-namespace qssc::targets::mock {
+namespace qssc::targets::systems::mock {
 
 [[maybe_unused]] int registrar = init();
 
-} // namespace qssc::targets::mock
+} // namespace qssc::targets::systems::mock
 
 #endif // HAL_TARGETS_MOCK_TARGET_H

mock_target/Target.inc renamed to targets/systems/mock/Target.inc

@@ -40,7 +40,7 @@
 
 using namespace mlir;
 using namespace mlir::quir;
-using namespace qssc::targets::mock;
+using namespace qssc::targets::systems::mock;
 
 namespace {
 // This map is from quir.orig_func_name to a list of functions that have that