3 files changed, 49 insertions, 81 deletions
diff --git a/llvm/unittests/tools/llvm-exegesis/ARM/AssemblerTest.cpp b/llvm/unittests/tools/llvm-exegesis/ARM/AssemblerTest.cpp
new file mode 100644
index 00000000000..e3da703a88e
--- /dev/null
+++ b/llvm/unittests/tools/llvm-exegesis/ARM/AssemblerTest.cpp
@@ -0,0 +1,48 @@
+//===-- AssemblerTest.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "../Common/AssemblerUtils.h"
+#include "ARMInstrInfo.h"
+
+namespace exegesis {
+namespace {
+
+using llvm::MCInstBuilder;
+
+class ARMMachineFunctionGeneratorTest
+    : public MachineFunctionGeneratorBaseTest {
+protected:
+  ARMMachineFunctionGeneratorTest()
+      : MachineFunctionGeneratorBaseTest("armv7-none-linux-gnueabi", "") {}
+
+  static void SetUpTestCase() {
+    LLVMInitializeARMTargetInfo();
+    LLVMInitializeARMTargetMC();
+    LLVMInitializeARMTarget();
+    LLVMInitializeARMAsmPrinter();
+  }
+};
+
+TEST_F(ARMMachineFunctionGeneratorTest, JitFunction) {
+  Check(llvm::MCInst(), 0x1e, 0xff, 0x2f, 0xe1);
+}
+
+TEST_F(ARMMachineFunctionGeneratorTest, JitFunctionADDrr) {
+  Check(MCInstBuilder(llvm::ARM::ADDrr)
+            .addReg(llvm::ARM::R0)
+            .addReg(llvm::ARM::R0)
+            .addReg(llvm::ARM::R0)
+            .addImm(llvm::ARMCC::AL)
+            .addReg(0)
+            .addReg(0),
+        0x00, 0x00, 0x80, 0xe0, 0x1e, 0xff, 0x2f, 0xe1);
+}
+
+} // namespace
+} // namespace exegesis
diff --git a/llvm/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt b/llvm/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
index aacb23b55b4..b000974938f 100644
--- a/llvm/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
+++ b/llvm/unittests/tools/llvm-exegesis/ARM/CMakeLists.txt
@@ -14,7 +14,6 @@ set(LLVM_LINK_COMPONENTS
   )
 
 add_llvm_unittest(LLVMExegesisARMTests
-  InMemoryAssemblerTest.cpp
+  AssemblerTest.cpp
   )
 target_link_libraries(LLVMExegesisARMTests PRIVATE LLVMExegesis)
-
diff --git a/llvm/unittests/tools/llvm-exegesis/ARM/InMemoryAssemblerTest.cpp b/llvm/unittests/tools/llvm-exegesis/ARM/InMemoryAssemblerTest.cpp
deleted file mode 100644
index 50564e56ba0..00000000000
--- a/llvm/unittests/tools/llvm-exegesis/ARM/InMemoryAssemblerTest.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//===-- InMemoryAssemblerTest.cpp -------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "InMemoryAssembler.h"
-#include "ARMInstrInfo.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/TargetInstrInfo.h"
-#include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/MC/MCInstBuilder.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-namespace exegesis {
-namespace {
-
-using llvm::MCInstBuilder;
-using testing::ElementsAre;
-
-class MachineFunctionGeneratorTest : public ::testing::Test {
-protected:
-  MachineFunctionGeneratorTest()
-      : TT("armv7-none-linux-gnueabi"), CpuName("") {}
-
-  static void SetUpTestCase() {
-    LLVMInitializeARMTargetInfo();
-    LLVMInitializeARMTargetMC();
-    LLVMInitializeARMTarget();
-    LLVMInitializeARMAsmPrinter();
-  }
-
-  std::unique_ptr<llvm::LLVMTargetMachine> createTargetMachine() {
-    std::string Error;
-    const llvm::Target *TheTarget =
-        llvm::TargetRegistry::lookupTarget(TT, Error);
-    assert(TheTarget);
-    const llvm::TargetOptions Options;
-    return std::unique_ptr<llvm::LLVMTargetMachine>(
-        static_cast<llvm::LLVMTargetMachine *>(TheTarget->createTargetMachine(
-            TT, CpuName, "", Options, llvm::Reloc::Model::Static)));
-  }
-
-private:
-  const std::string TT;
-  const std::string CpuName;
-};
-
-TEST_F(MachineFunctionGeneratorTest, JitFunction) {
-  JitFunctionContext Context(createTargetMachine());
-  JitFunction Function(std::move(Context), {});
-  ASSERT_THAT(Function.getFunctionBytes().str(),
-              ElementsAre(0x1e, 0xff, 0x2f, 0xe1));
-}
-
-TEST_F(MachineFunctionGeneratorTest, JitFunctionADDrr) {
-  JitFunctionContext Context(createTargetMachine());
-  JitFunction Function(std::move(Context), {MCInstBuilder(llvm::ARM::ADDrr)
-                                                .addReg(llvm::ARM::R0)
-                                                .addReg(llvm::ARM::R0)
-                                                .addReg(llvm::ARM::R0)
-                                                .addImm(llvm::ARMCC::AL)
-                                                .addReg(0)
-                                                .addReg(0)});
-  ASSERT_THAT(Function.getFunctionBytes().str(),
-              ElementsAre(0x00, 0x00, 0x80, 0xe0, 0x1e, 0xff, 0x2f, 0xe1));
-}
-
-} // namespace
-} // namespace exegesis