llvm-reduce: Try to parse triple/datalayout from module

[arsenm]

Summary

This saves needing to specify -mtriple on nearly every use for MIR
reduction.

[markus]

I think @reames requested this back in D110527

[arsenm]

A bit more diagnostic consistency

[markus]

LGTM

[arsenm]

llvm/tools/llvm-reduce/ReducerWorkItem.cpp

292

Added an ugly downcast, like llc, to avoid the dependence on D123964

[arsenm]

1747a93b28c3ee7de45c4591186b0972f799ba13

[haowei]

Hi,

We are seeing test failures on Fuchsia Clang builder for windows-x64 after this change have landed.

Failed tests are:

LLVM :: tools/llvm-reduce/fail-file-open.test
LLVM :: tools/llvm-reduce/mir/infer-triple-unknown-target.mir

Error messages:

Script:
--
: 'RUN: at line 1';   not llvm-reduce --test=echo C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir 2>&1 | c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "not" "llvm-reduce" "--test=echo" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir"
$ "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test"
# command stderr:
C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test:5:10: error: CHECK: expected string not found in input
# CHECK: llvm-reduce: {{.*}}.NotAFileInTestingDir: error:
         ^
<stdin>:1:1: note: scanning from here
llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory
^
<stdin>:1:81: note: possible intended match here
llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory
                                                                                ^

Input file: <stdin>
Check file: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test

-dump-input=help explains the following input dump.

Input was:
<<<<<<
           1: llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory 
check:5'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
check:5'1                                                                                     ?                                                                                                     possible intended match
>>>>>>

error: command failed with exit status: 1

--

and

Script:
--
: 'RUN: at line 1';   not llvm-reduce --test c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir -o /dev/null 2>&1 | c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "not" "llvm-reduce" "--test" "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir" "-o" "/dev/null"
$ "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir"
# command stderr:
C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir:3:10: error: CHECK: expected string not found in input
# CHECK: llvm-reduce: error: unable to get target for 'omgwtfbbqcpu64--', see --version and --triple.
         ^
<stdin>:1:1: note: scanning from here
llvm-reduce.exe: error: unable to get target for 'omgwtfbbqcpu64--', see --version and --triple.
^

Input file: <stdin>
Check file: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir

-dump-input=help explains the following input dump.

Input was:
<<<<<<
         1: llvm-reduce.exe: error: unable to get target for 'omgwtfbbqcpu64--', see --version and --triple. 
check:3     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
>>>>>>

error: command failed with exit status: 1

--

It is quite obvious that both tests did not consider that Windows has ".exe" suffix to its executables

Could you fix the breaking tests? If it takes a while to fix, could you revert your change please? Thanks.

[arsenm]

In D123998#3478534, @haowei wrote:

Hi,

We are seeing test failures on Fuchsia Clang builder for windows-x64 after this change have landed.

Failed tests are:

LLVM :: tools/llvm-reduce/fail-file-open.test
LLVM :: tools/llvm-reduce/mir/infer-triple-unknown-target.mir

Error messages:

Script:
--
: 'RUN: at line 1';   not llvm-reduce --test=echo C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir 2>&1 | c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "not" "llvm-reduce" "--test=echo" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir"
$ "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test"
# command stderr:
C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test:5:10: error: CHECK: expected string not found in input
# CHECK: llvm-reduce: {{.*}}.NotAFileInTestingDir: error:
         ^
<stdin>:1:1: note: scanning from here
llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory
^
<stdin>:1:81: note: possible intended match here
llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory
                                                                                ^

Input file: <stdin>
Check file: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test

-dump-input=help explains the following input dump.

Input was:
<<<<<<
           1: llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory 
check:5'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
check:5'1                                                                                     ?                                                                                                     possible intended match
>>>>>>

error: command failed with exit status: 1

--

and

Script:
--
: 'RUN: at line 1';   not llvm-reduce --test c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir -o /dev/null 2>&1 | c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "not" "llvm-reduce" "--test" "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir" "-o" "/dev/null"
$ "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir"
# command stderr:
C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir:3:10: error: CHECK: expected string not found in input
# CHECK: llvm-reduce: error: unable to get target for 'omgwtfbbqcpu64--', see --version and --triple.
         ^
<stdin>:1:1: note: scanning from here
llvm-reduce.exe: error: unable to get target for 'omgwtfbbqcpu64--', see --version and --triple.
^

Input file: <stdin>
Check file: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\mir\infer-triple-unknown-target.mir

-dump-input=help explains the following input dump.

Input was:
<<<<<<
         1: llvm-reduce.exe: error: unable to get target for 'omgwtfbbqcpu64--', see --version and --triple. 
check:3     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
>>>>>>

error: command failed with exit status: 1

--

It is quite obvious that both tests did not consider that Windows has ".exe" suffix to its executables

Could you fix the breaking tests? If it takes a while to fix, could you revert your change please? Thanks.

This is already fixed

[thakis]

No, it's still broken. Windows also prints the "N" of "No such file" in upper case.

See e.g. http://45.33.8.238/win/57129/step_11.txt for a failure log at HEAD.

[haowei]

Test LLVM :: tools/llvm-reduce/fail-file-open.test is still failing on our windows bots after the fix:

Script:
--
: 'RUN: at line 1';   not llvm-reduce --test=echo C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir 2>&1 | c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "not" "llvm-reduce" "--test=echo" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir"
$ "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test"
# command stderr:
C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test:5:10: error: CHECK: expected string not found in input
# CHECK: llvm-reduce: {{.*}}.NotAFileInTestingDir: error:
         ^
<stdin>:1:1: note: scanning from here
llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory
^
<stdin>:1:81: note: possible intended match here
llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory
                                                                                ^

Input file: <stdin>
Check file: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test

-dump-input=help explains the following input dump.

Input was:
<<<<<<
           1: llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory 
check:5'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
check:5'1                                                                                     ?                                                                                                     possible intended match
>>>>>>

error: command failed with exit status: 1

--

This test still did not consider the ".exe" suffix on Windows

LLVM :: tools/llvm-reduce/mir/infer-triple-unknown-target.mir did passed on our builder but I think the capital "N" issue depends on the toolchain and SDK you use on Windows. Test like lld/test/COFF/driver.test use something like # RUN: FileCheck -DMSG=%errc_ENOENT -check-prefix=MISSING %s < %t.log to avoid this issue. And there is a dedicate CMake step in https://github.com/llvm/llvm-project/blob/c265170110b2e3b82ab8fca6658bfbbce79381c5/llvm/cmake/modules/GetErrcMessages.cmake#L31 to generate correct error string under different OS.

You probably want to use this approach in your tests.

[arsenm]

In D123998#3478719, @haowei wrote:

Test LLVM :: tools/llvm-reduce/fail-file-open.test is still failing on our windows bots after the fix:

Script:
--
: 'RUN: at line 1';   not llvm-reduce --test=echo C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir 2>&1 | c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "not" "llvm-reduce" "--test=echo" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir"
$ "c:\b\s\w\ir\x\w\staging\llvm_build\bin\filecheck.exe" "C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test"
# command stderr:
C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test:5:10: error: CHECK: expected string not found in input
# CHECK: llvm-reduce: {{.*}}.NotAFileInTestingDir: error:
         ^
<stdin>:1:1: note: scanning from here
llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory
^
<stdin>:1:81: note: possible intended match here
llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory
                                                                                ^

Input file: <stdin>
Check file: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test

-dump-input=help explains the following input dump.

Input was:
<<<<<<
           1: llvm-reduce.exe: C:\b\s\w\ir\x\w\llvm-llvm-project\llvm\test\tools\llvm-reduce\fail-file-open.test.NotAFileInTestingDir: error: Could not open input file: no such file or directory 
check:5'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
check:5'1                                                                                     ?                                                                                                     possible intended match
>>>>>>

error: command failed with exit status: 1

--

This test still did not consider the ".exe" suffix on Windows

LLVM :: tools/llvm-reduce/mir/infer-triple-unknown-target.mir did passed on our builder but I think the capital "N" issue depends on the toolchain and SDK you use on Windows. Test like lld/test/COFF/driver.test use something like # RUN: FileCheck -DMSG=%errc_ENOENT -check-prefix=MISSING %s < %t.log to avoid this issue. And there is a dedicate CMake step in https://github.com/llvm/llvm-project/blob/c265170110b2e3b82ab8fca6658bfbbce79381c5/llvm/cmake/modules/GetErrcMessages.cmake#L31 to generate correct error string under different OS.

You probably want to use this approach in your tests.

I’m not sure I understand this approach. Maybe it’s just not worth testing the error message prefix

[thakis]

(ps: please include a line like "Differential Revision: D123998" in the commit message of https://github.com/llvm/llvm-project/commit/1747a93b28c3ee7de45c4591186b0972f799ba13 going forward, to make it easier to go from commit to review.)

[thakis]

Test is still broken on Windows. Time to revert?

[arsenm]

In D123998#3479895, @thakis wrote:

Test is still broken on Windows. Time to revert?

I just weakened the check in cf68b31f14a9de549a2f6052cc68ca1cc8198302

[thakis]

Apologies, looks like the remaining failure (http://45.33.8.238/win/57162/step_11.txt) isn't due to this change but due to e39e9d339c94cb7f421403a2980998b4a4b6a1a1. (I failed to find the right review because the commit message didn't link to the review.) I tried fixing that failure in ddfffbeb319aa0cd0eb11c81e2cf989d38ab8a5f , let's see if it helps.

There's a windows bot on the public waterfall (https://lab.llvm.org/buildbot/#/console) at https://lab.llvm.org/buildbot/#/builders/123 that you can use to make sure your fixes work. Keeping a bot red for > 15h isn't ideal, of course.

llvm/test/tools/llvm-reduce/mir/infer-triple-unknown-target.mir

+# RUN: not llvm-reduce --test FileCheck %s -o /dev/null 2>&1 | FileCheck %s
+
+# CHECK: llvm-reduce: error: unable to get target for 'omgwtfbbqcpu64--', see --version and --triple.
+
+--- |
+  target triple = "omgwtfbbqcpu64--"
+
+  define void @func() {
+    ret void
+  }
+
+...
+---
+name: func
+tracksRegLiveness: true
+body:             |
+  bb.0:
+
+...

llvm/test/tools/llvm-reduce/mir/infer-triple.mir

+# REQUIRES: amdgpu-registered-target
+# RUN: llvm-reduce -simplify-mir --test FileCheck --test-arg --check-prefix=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t 2> %t.log
+# RUN: FileCheck --check-prefix=RESULT %s < %t
+
+# Test that the MIR parser successfully infers the target triple from
+# the module and avoids needing the -mtriple flag.
+
+# CHECK-INTERESTINGNESS: S_ENDPGM
+
+# RESULT: name: func
+
+--- |
+  target triple = "amdgcn-amd-amdhsa"
+
+  define void @func() {
+    ret void
+  }
+
+...
+---
+name: func
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    S_NOP 0
+    S_ENDPGM 0
+...

llvm/tools/llvm-reduce/ReducerWorkItem.h

 //===- ReducerWorkItem.h - Wrapper for Module and MachineFunction ---------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_TOOLS_LLVM_REDUCE_REDUCERWORKITEM_H
 #define LLVM_TOOLS_LLVM_REDUCE_REDUCERWORKITEM_H
 
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/IR/Module.h"
+#include "llvm/Target/TargetMachine.h"
 
 using namespace llvm;
 
 class ReducerWorkItem {
 public:
   std::shared_ptr<Module> M;
   std::unique_ptr<MachineFunction> MF;
   void print(raw_ostream &ROS, void *p = nullptr) const;
   bool isMIR() { return MF != nullptr; }
   operator Module &() const { return *M; }
   operator MachineFunction &() const { return *MF; }
 };
 
-std::unique_ptr<ReducerWorkItem> parseReducerWorkItem(StringRef Filename,
-                                                      LLVMContext &Ctxt,
-                                                      MachineModuleInfo *MMI);
+std::unique_ptr<ReducerWorkItem>
+parseReducerWorkItem(StringRef ToolName, StringRef Filename, LLVMContext &Ctxt,
+                     std::unique_ptr<TargetMachine> &TM,
+                     std::unique_ptr<MachineModuleInfo> &MMI, bool IsMIR);
 
 std::unique_ptr<ReducerWorkItem>
 cloneReducerWorkItem(const ReducerWorkItem &MMM);
 
 bool verifyReducerWorkItem(const ReducerWorkItem &MMM, raw_fd_ostream *OS);
 
 #endif

llvm/tools/llvm-reduce/ReducerWorkItem.cpp

 //===- ReducerWorkItem.cpp - Wrapper for Module and MachineFunction -------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "ReducerWorkItem.h"
+#include "llvm/CodeGen/CommandFlags.h"
 #include "llvm/CodeGen/MIRParser/MIRParser.h"
 #include "llvm/CodeGen/MIRPrinter.h"
 #include "llvm/CodeGen/MachineDominators.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/TargetInstrInfo.h"
 #include "llvm/IR/Verifier.h"
 #include "llvm/IRReader/IRReader.h"
+#include "llvm/MC/TargetRegistry.h"
+#include "llvm/Support/Host.h"
 #include "llvm/Support/SourceMgr.h"
+#include "llvm/Support/WithColor.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 
+extern cl::OptionCategory LLVMReduceOptions;
+static cl::opt<std::string> TargetTriple("mtriple",
+                                         cl::desc("Set the target triple"),
+                                         cl::cat(LLVMReduceOptions));
+
 static void cloneFrameInfo(
     MachineFrameInfo &DstMFI, const MachineFrameInfo &SrcMFI,
     const DenseMap<MachineBasicBlock *, MachineBasicBlock *> &Src2DstMBB) {
   DstMFI.setFrameAddressIsTaken(SrcMFI.isFrameAddressTaken());
   DstMFI.setReturnAddressIsTaken(SrcMFI.isReturnAddressTaken());
   DstMFI.setHasStackMap(SrcMFI.hasStackMap());
   DstMFI.setHasPatchPoint(SrcMFI.hasPatchPoint());
   DstMFI.setUseLocalStackAllocationBlock(
if (!DstMF->cloneInfoFrom(*SrcMF, Src2DstMBB))
     report_fatal_error("target does not implement MachineFunctionInfo cloning");
 
   DstMRI->freezeReservedRegs(*DstMF);
 
   DstMF->verify(nullptr, "", /*AbortOnError=*/true);
   return DstMF;
 }
 
-std::unique_ptr<ReducerWorkItem> parseReducerWorkItem(StringRef Filename,
-                                                      LLVMContext &Ctxt,
-                                                      MachineModuleInfo *MMI) {
+std::unique_ptr<ReducerWorkItem>
+parseReducerWorkItem(StringRef ToolName, StringRef Filename, LLVMContext &Ctxt,
+                     std::unique_ptr<TargetMachine> &TM,
+                     std::unique_ptr<MachineModuleInfo> &MMI, bool IsMIR) {
+  Triple TheTriple;
+
   auto MMM = std::make_unique<ReducerWorkItem>();
-  if (MMI) {
+
+  if (IsMIR) {
     auto FileOrErr = MemoryBuffer::getFileOrSTDIN(Filename, /*IsText=*/true);
     std::unique_ptr<MIRParser> MParser =
         createMIRParser(std::move(FileOrErr.get()), Ctxt);
 
     auto SetDataLayout =
         [&](StringRef DataLayoutTargetTriple) -> Optional<std::string> {
-      return MMI->getTarget().createDataLayout().getStringRepresentation();
+      // If we are supposed to override the target triple, do so now.
+      std::string IRTargetTriple = DataLayoutTargetTriple.str();
+      if (!TargetTriple.empty())
+        IRTargetTriple = Triple::normalize(TargetTriple);
+      TheTriple = Triple(IRTargetTriple);
+      if (TheTriple.getTriple().empty())
+        TheTriple.setTriple(sys::getDefaultTargetTriple());
+
+      std::string Error;
+      const Target *TheTarget =
+          TargetRegistry::lookupTarget(codegen::getMArch(), TheTriple, Error);
+      if (!TheTarget) {
+        WithColor::error(errs(), ToolName) << Error;
+        exit(1);
+      }
+
+      // Hopefully the MIR parsing doesn't depend on any options.
+      TargetOptions Options;
+      Optional<Reloc::Model> RM = codegen::getExplicitRelocModel();
+      std::string CPUStr = codegen::getCPUStr();
+      std::string FeaturesStr = codegen::getFeaturesStr();
+      TM = std::unique_ptr<TargetMachine>(TheTarget->createTargetMachine(
+          TheTriple.getTriple(), CPUStr, FeaturesStr, Options, RM,
+          codegen::getExplicitCodeModel(), CodeGenOpt::Default));
+      assert(TM && "Could not allocate target machine!");
+
+      return TM->createDataLayout().getStringRepresentation();
     };
 
     std::unique_ptr<Module> M = MParser->parseIRModule(SetDataLayout);
+    MMI = std::make_unique<MachineModuleInfo>(TM.get());
     MParser->parseMachineFunctions(*M, *MMI);
     MachineFunction *MF = nullptr;
     for (auto &F : *M) {
       if (F.getName() == "ignoreme")
         continue;
 
       if (auto *MF4F = MMI->getMachineFunction(F)) {
         // XXX: Maybe it would not be a lot of effort to handle multiple MFs by

llvm/tools/llvm-reduce/llvm-reduce.cpp

 #include "llvm/IR/Verifier.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/WithColor.h"
-#include "llvm/Target/TargetMachine.h"
+#include "llvm/Support/raw_ostream.h"
 #include <system_error>
 #include <vector>
 
 using namespace llvm;
 
 cl::OptionCategory LLVMReduceOptions("llvm-reduce options");
 
 static cl::opt<bool> Help("h", cl::desc("Alias for -help"), cl::Hidden,

 static cl::opt<InputLanguages>
     InputLanguage("x", cl::ValueOptional,
                   cl::desc("Input language ('ir' or 'mir')"),
                   cl::init(InputLanguages::None),
                   cl::values(clEnumValN(InputLanguages::IR, "ir", ""),
                              clEnumValN(InputLanguages::MIR, "mir", "")),
                   cl::cat(LLVMReduceOptions));
 
-static cl::opt<std::string> TargetTriple("mtriple",
-                                         cl::desc("Set the target triple"),
-                                         cl::cat(LLVMReduceOptions));
-
 static cl::opt<int>
     MaxPassIterations("max-pass-iterations",
                       cl::desc("Maximum number of times to run the full set "
                                "of delta passes (default=1)"),
                       cl::init(1), cl::cat(LLVMReduceOptions));
 
 static codegen::RegisterCodeGenFlags CGF;
 
+static void initializeTargetInfo() {
+  InitializeAllTargets();
+  InitializeAllTargetMCs();
+  InitializeAllAsmPrinters();
+  InitializeAllAsmParsers();
+}
+
 void writeOutput(ReducerWorkItem &M, StringRef Message) {
   if (ReplaceInput) // In-place
     OutputFilename = InputFilename.c_str();
   else if (OutputFilename.empty() || OutputFilename == "-")
     OutputFilename = M.isMIR() ? "reduced.mir" : "reduced.ll";
   std::error_code EC;
   raw_fd_ostream Out(OutputFilename, EC);
   if (EC) {
     errs() << "Error opening output file: " << EC.message() << "!\n";
     exit(1);
   }
   M.print(Out, /*AnnotationWriter=*/nullptr);
   errs() << Message << OutputFilename << "\n";
 }
 
-static std::unique_ptr<LLVMTargetMachine> createTargetMachine() {
-  InitializeAllTargets();
-  InitializeAllTargetMCs();
-  InitializeAllAsmPrinters();
-  InitializeAllAsmParsers();
-
-  if (TargetTriple == "")
-    TargetTriple = sys::getDefaultTargetTriple();
-  auto TT(Triple::normalize(TargetTriple));
-  std::string CPU(codegen::getCPUStr());
-  std::string FS(codegen::getFeaturesStr());
-
-  std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);
-
-  return std::unique_ptr<LLVMTargetMachine>(
-      static_cast<LLVMTargetMachine *>(TheTarget->createTargetMachine(
-          TT, CPU, FS, TargetOptions(), None, None, CodeGenOpt::Default)));
-}
-
 int main(int Argc, char **Argv) {
   InitLLVM X(Argc, Argv);
 
   cl::HideUnrelatedOptions({&LLVMReduceOptions, &getColorCategory()});
   cl::ParseCommandLineOptions(Argc, Argv, "LLVM automatic testcase reducer.\n");
 
   bool ReduceModeMIR = false;
   if (InputLanguage != InputLanguages::None) {
     if (InputLanguage == InputLanguages::MIR)
       ReduceModeMIR = true;
   } else if (StringRef(InputFilename).endswith(".mir")) {
     ReduceModeMIR = true;
   }
 
   if (PrintDeltaPasses) {
     printDeltaPasses(errs());
     return 0;
   }
 
+  if (ReduceModeMIR)
+    initializeTargetInfo();
+
   LLVMContext Context;
-  std::unique_ptr<LLVMTargetMachine> TM;
+  std::unique_ptr<TargetMachine> TM;
   std::unique_ptr<MachineModuleInfo> MMI;
-  std::unique_ptr<ReducerWorkItem> OriginalProgram;
-  if (ReduceModeMIR) {
-    TM = createTargetMachine();
-    MMI = std::make_unique<MachineModuleInfo>(TM.get());
-  }
-  OriginalProgram = parseReducerWorkItem(InputFilename, Context, MMI.get());
+
+  std::unique_ptr<ReducerWorkItem> OriginalProgram = parseReducerWorkItem(
+      Argv[0], InputFilename, Context, TM, MMI, ReduceModeMIR);
   if (!OriginalProgram) {
     return 1;
   }
 
   // Initialize test environment
   TestRunner Tester(TestFilename, TestArguments, std::move(OriginalProgram));
 
   // Try to reduce code