Update caffe2 with LLVM-18 API change (pytorch#109408)

Summary: llvm/llvm-project#66295 modified some internal LLVM APIs, update these places with the changes under LLVM version guard Test Plan: CI Differential Revision: D49340871 Pull Request resolved: pytorch#109408 Approved by: https://github.com/Skylion007
ROCm · Oct 4, 2023 · a49a6a0 · a49a6a0
1 parent aa19992
commit a49a6a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/torch/csrc/jit/tensorexpr/llvm_codegen.cpp b/torch/csrc/jit/tensorexpr/llvm_codegen.cpp
@@ -739,7 +739,9 @@ void LLVMCodeGenImpl::emitKernel(
       PM,
       asmStream,
       nullptr,
-#if LLVM_VERSION_MAJOR >= 10
+#if LLVM_VERSION_MAJOR >= 18
+      llvm::CodeGenFileType::AssemblyFile);
+#elif LLVM_VERSION_MAJOR >= 10
       llvm::CodeGenFileType::CGFT_AssemblyFile);
 #else
       llvm::TargetMachine::CodeGenFileType::CGFT_AssemblyFile);

diff --git a/torch/csrc/jit/tensorexpr/llvm_jit.cpp b/torch/csrc/jit/tensorexpr/llvm_jit.cpp
@@ -101,7 +101,11 @@ static llvm::orc::JITTargetMachineBuilder makeTargetMachineBuilder(
     c10::optional<std::string> attrs) {
   auto JTMB = triple ? makeJTMBFromTriple(*triple, cpu, attrs)
                      : makeJTMBFromHost(cpu, attrs);
+#if LLVM_VERSION_MAJOR >= 18
+  JTMB.setCodeGenOptLevel(llvm::CodeGenOptLevel::Default);
+#else
   JTMB.setCodeGenOptLevel(llvm::CodeGenOpt::Default);
+#endif
   JTMB.getOptions().AllowFPOpFusion = llvm::FPOpFusion::Fast;
   return JTMB;
 }