Revert "[MLIR] Move builtin.module LLVM IR translation to before nested operations"

This reverts commit 0b8c636.

Author: skatrak

mlir/lib/Target/LLVMIR/ModuleTranslation.cpp

@@ -1377,15 +1377,6 @@ mlir::translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext,
   LLVM::ensureDistinctSuccessors(module);
 
   ModuleTranslation translator(module, std::move(llvmModule));
-  llvm::IRBuilder<> llvmBuilder(llvmContext);
-
-  // Convert module before functions and operations inside, so dialect
-  // attributes can be used to change dialect-specific global configurations via
-  // `amendOperation()`. These configurations can then influence the translation
-  // of operations afterwards.
-  if (failed(translator.convertOperation(*module, llvmBuilder)))
-    return nullptr;
-
   if (failed(translator.convertComdats()))
     return nullptr;
   if (failed(translator.convertFunctionSignatures()))
@@ -1396,6 +1387,7 @@ mlir::translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext,
     return nullptr;
 
   // Convert other top-level operations if possible.
+  llvm::IRBuilder<> llvmBuilder(llvmContext);
   for (Operation &o : getModuleBody(module).getOperations()) {
     if (!isa<LLVM::LLVMFuncOp, LLVM::GlobalOp, LLVM::GlobalCtorsOp,
              LLVM::GlobalDtorsOp, LLVM::ComdatOp>(&o) &&
@@ -1411,6 +1403,10 @@ mlir::translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext,
   if (failed(translator.convertFunctions()))
     return nullptr;
 
+  // Convert module itself.
+  if (failed(translator.convertOperation(*module, llvmBuilder)))
+    return nullptr;
+
   if (llvm::verifyModule(*translator.llvmModule, &llvm::errs()))
     return nullptr;
 

mlir/test/Target/LLVMIR/test.mlir

@@ -2,7 +2,6 @@ set(LLVM_OPTIONAL_SOURCES
   TestDialect.cpp
   TestPatterns.cpp
   TestTraits.cpp
-  TestToLLVMIRTranslation.cpp
 )
 
 set(LLVM_TARGET_DEFINITIONS TestInterfaces.td)
@@ -84,19 +83,4 @@ add_mlir_library(MLIRTestDialect
   MLIRTensorDialect
   MLIRTransformUtils
   MLIRTransforms
-  )
-
-add_mlir_translation_library(MLIRTestToLLVMIRTranslation
-  TestToLLVMIRTranslation.cpp
-
-  LINK_COMPONENTS
-  Core
-
-  LINK_LIBS PUBLIC
-  MLIRIR
-  MLIRLLVMDialect
-  MLIRTestDialect
-  MLIRSupport
-  MLIRBuiltinToLLVMIRTranslation
-  MLIRLLVMToLLVMIRTranslation
-  )
+)

mlir/test/lib/Dialect/Test/CMakeLists.txt

@@ -21,17 +21,11 @@ namespace mlir {
 // Defined in the test directory, no public header.
 void registerTestRoundtripSPIRV();
 void registerTestRoundtripDebugSPIRV();
-#ifdef MLIR_INCLUDE_TESTS
-void registerTestToLLVMIR();
-#endif
 } // namespace mlir
 
 static void registerTestTranslations() {
   registerTestRoundtripSPIRV();
   registerTestRoundtripDebugSPIRV();
-#ifdef MLIR_INCLUDE_TESTS
-  registerTestToLLVMIR();
-#endif
 }
 
 int main(int argc, char **argv) {