Revert "[CIR] Add additional frontend actions (llvm#127249)"

This reverts commit 75ea7ae.

Author: lanza

clang/include/clang/CIR/Dialect/IR/CIRDialect.td

@@ -28,8 +28,6 @@ def CIR_Dialect : Dialect {
   let useDefaultTypePrinterParser = 0;
 
   let extraClassDeclaration = [{
-    static llvm::StringRef getTripleAttrName() { return "cir.triple"; }
-
     void registerAttributes();
     void registerTypes();
 

clang/include/clang/CIR/FrontendAction/CIRGenAction.h

@@ -25,11 +25,8 @@ class CIRGenConsumer;
 class CIRGenAction : public clang::ASTFrontendAction {
 public:
   enum class OutputType {
-    EmitAssembly,
     EmitCIR,
     EmitLLVM,
-    EmitBC,
-    EmitObj,
   };
 
 private:
@@ -66,27 +63,6 @@ class EmitLLVMAction : public CIRGenAction {
   EmitLLVMAction(mlir::MLIRContext *MLIRCtx = nullptr);
 };
 
-class EmitBCAction : public CIRGenAction {
-  virtual void anchor();
-
-public:
-  EmitBCAction(mlir::MLIRContext *MLIRCtx = nullptr);
-};
-
-class EmitAssemblyAction : public CIRGenAction {
-  virtual void anchor();
-
-public:
-  EmitAssemblyAction(mlir::MLIRContext *MLIRCtx = nullptr);
-};
-
-class EmitObjAction : public CIRGenAction {
-  virtual void anchor();
-
-public:
-  EmitObjAction(mlir::MLIRContext *MLIRCtx = nullptr);
-};
-
 } // namespace cir
 
 #endif

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -52,9 +52,6 @@ CIRGenModule::CIRGenModule(mlir::MLIRContext &mlirContext,
   DoubleTy = cir::DoubleType::get(&getMLIRContext());
   FP80Ty = cir::FP80Type::get(&getMLIRContext());
   FP128Ty = cir::FP128Type::get(&getMLIRContext());
-
-  theModule->setAttr(cir::CIRDialect::getTripleAttrName(),
-                     builder.getStringAttr(getTriple().str()));
 }
 
 mlir::Location CIRGenModule::getLoc(SourceLocation cLoc) {

clang/lib/CIR/CodeGen/CIRGenModule.h

@@ -21,9 +21,7 @@
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/MLIRContext.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/TargetParser/Triple.h"
 
 namespace clang {
 class ASTContext;
@@ -90,8 +88,6 @@ class CIRGenModule : public CIRGenTypeCache {
   void emitGlobalVarDefinition(const clang::VarDecl *vd,
                                bool isTentative = false);
 
-  const llvm::Triple &getTriple() const { return target.getTriple(); }
-
   /// Helpers to emit "not yet implemented" error diagnostics
   DiagnosticBuilder errorNYI(SourceLocation, llvm::StringRef);
 

clang/lib/CIR/FrontendAction/CIRGenAction.cpp

@@ -27,14 +27,8 @@ getBackendActionFromOutputType(CIRGenAction::OutputType Action) {
     assert(false &&
            "Unsupported output type for getBackendActionFromOutputType!");
     break; // Unreachable, but fall through to report that
-  case CIRGenAction::OutputType::EmitAssembly:
-    return BackendAction::Backend_EmitAssembly;
-  case CIRGenAction::OutputType::EmitBC:
-    return BackendAction::Backend_EmitBC;
   case CIRGenAction::OutputType::EmitLLVM:
     return BackendAction::Backend_EmitLL;
-  case CIRGenAction::OutputType::EmitObj:
-    return BackendAction::Backend_EmitObj;
   }
   // We should only get here if a non-enum value is passed in or we went through
   // the assert(false) case above
@@ -90,10 +84,7 @@ class CIRGenConsumer : public clang::ASTConsumer {
         MlirModule->print(*OutputStream, Flags);
       }
       break;
-    case CIRGenAction::OutputType::EmitLLVM:
-    case CIRGenAction::OutputType::EmitBC:
-    case CIRGenAction::OutputType::EmitObj:
-    case CIRGenAction::OutputType::EmitAssembly: {
+    case CIRGenAction::OutputType::EmitLLVM: {
       llvm::LLVMContext LLVMCtx;
       std::unique_ptr<llvm::Module> LLVMModule =
           lowerFromCIRToLLVMIR(MlirModule, LLVMCtx);
@@ -120,16 +111,10 @@ static std::unique_ptr<raw_pwrite_stream>
 getOutputStream(CompilerInstance &CI, StringRef InFile,
                 CIRGenAction::OutputType Action) {
   switch (Action) {
-  case CIRGenAction::OutputType::EmitAssembly:
-    return CI.createDefaultOutputFile(false, InFile, "s");
   case CIRGenAction::OutputType::EmitCIR:
     return CI.createDefaultOutputFile(false, InFile, "cir");
   case CIRGenAction::OutputType::EmitLLVM:
     return CI.createDefaultOutputFile(false, InFile, "ll");
-  case CIRGenAction::OutputType::EmitBC:
-    return CI.createDefaultOutputFile(true, InFile, "bc");
-  case CIRGenAction::OutputType::EmitObj:
-    return CI.createDefaultOutputFile(true, InFile, "o");
   }
   llvm_unreachable("Invalid CIRGenAction::OutputType");
 }
@@ -147,22 +132,10 @@ CIRGenAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) {
   return Result;
 }
 
-void EmitAssemblyAction::anchor() {}
-EmitAssemblyAction::EmitAssemblyAction(mlir::MLIRContext *MLIRCtx)
-    : CIRGenAction(OutputType::EmitAssembly, MLIRCtx) {}
-
 void EmitCIRAction::anchor() {}
 EmitCIRAction::EmitCIRAction(mlir::MLIRContext *MLIRCtx)
     : CIRGenAction(OutputType::EmitCIR, MLIRCtx) {}
 
 void EmitLLVMAction::anchor() {}
 EmitLLVMAction::EmitLLVMAction(mlir::MLIRContext *MLIRCtx)
     : CIRGenAction(OutputType::EmitLLVM, MLIRCtx) {}
-
-void EmitBCAction::anchor() {}
-EmitBCAction::EmitBCAction(mlir::MLIRContext *MLIRCtx)
-    : CIRGenAction(OutputType::EmitBC, MLIRCtx) {}
-
-void EmitObjAction::anchor() {}
-EmitObjAction::EmitObjAction(mlir::MLIRContext *MLIRCtx)
-    : CIRGenAction(OutputType::EmitObj, MLIRCtx) {}

clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

@@ -114,8 +114,6 @@ struct ConvertCIRToLLVMPass
   }
   void runOnOperation() final;
 
-  void processCIRAttrs(mlir::ModuleOp module);
-
   StringRef getDescription() const override {
     return "Convert the prepared CIR dialect module to LLVM dialect";
   }
@@ -273,13 +271,6 @@ static void prepareTypeConverter(mlir::LLVMTypeConverter &converter,
   });
 }
 
-void ConvertCIRToLLVMPass::processCIRAttrs(mlir::ModuleOp module) {
-  // Lower the module attributes to LLVM equivalents.
-  if (auto tripleAttr = module->getAttr(cir::CIRDialect::getTripleAttrName()))
-    module->setAttr(mlir::LLVM::LLVMDialect::getTargetTripleAttrName(),
-                    tripleAttr);
-}
-
 void ConvertCIRToLLVMPass::runOnOperation() {
   llvm::TimeTraceScope scope("Convert CIR to LLVM Pass");
 
@@ -292,8 +283,6 @@ void ConvertCIRToLLVMPass::runOnOperation() {
 
   patterns.add<CIRToLLVMGlobalOpLowering>(converter, patterns.getContext(), dl);
 
-  processCIRAttrs(module);
-
   mlir::ConversionTarget target(getContext());
   target.addLegalOp<mlir::ModuleOp>();
   target.addLegalDialect<mlir::LLVM::LLVMDialect>();

clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp

@@ -62,18 +62,8 @@ CreateFrontendBaseAction(CompilerInstance &CI) {
     return std::make_unique<DumpCompilerOptionsAction>();
   case DumpRawTokens:          return std::make_unique<DumpRawTokensAction>();
   case DumpTokens:             return std::make_unique<DumpTokensAction>();
-  case EmitAssembly:
-#if CLANG_ENABLE_CIR
-    if (UseCIR)
-      return std::make_unique<cir::EmitAssemblyAction>();
-#endif
-    return std::make_unique<EmitAssemblyAction>();
-  case EmitBC:
-#if CLANG_ENABLE_CIR
-    if (UseCIR)
-      return std::make_unique<cir::EmitBCAction>();
-#endif
-    return std::make_unique<EmitBCAction>();
+  case EmitAssembly:           return std::make_unique<EmitAssemblyAction>();
+  case EmitBC:                 return std::make_unique<EmitBCAction>();
   case EmitCIR:
 #if CLANG_ENABLE_CIR
     return std::make_unique<cir::EmitCIRAction>();
@@ -90,12 +80,7 @@ CreateFrontendBaseAction(CompilerInstance &CI) {
   }
   case EmitLLVMOnly:           return std::make_unique<EmitLLVMOnlyAction>();
   case EmitCodeGenOnly:        return std::make_unique<EmitCodeGenOnlyAction>();
-  case EmitObj:
-#if CLANG_ENABLE_CIR
-    if (UseCIR)
-      return std::make_unique<cir::EmitObjAction>();
-#endif
-    return std::make_unique<EmitObjAction>();
+  case EmitObj:                return std::make_unique<EmitObjAction>();
   case ExtractAPI:
     return std::make_unique<ExtractAPIAction>();
   case FixIt:                  return std::make_unique<FixItAction>();