projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add mfasr and mtasr
[oota-llvm.git]
/
unittests
/
ExecutionEngine
/
JIT
/
JITEventListenerTest.cpp
diff --git
a/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp
b/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp
index a58a0872a4ec9a1a4b373937bc64f88c44564a2b..175b9fb107b818c81a5dc21a5942c2bf3a3a0029 100644
(file)
--- a/
unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp
+++ b/
unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp
@@
-8,24
+8,18
@@
//===----------------------------------------------------------------------===//
#include "llvm/ExecutionEngine/JITEventListener.h"
//===----------------------------------------------------------------------===//
#include "llvm/ExecutionEngine/JITEventListener.h"
-
-#include "llvm/LLVMContext.h"
-#include "llvm/Instructions.h"
-#include "llvm/Module.h"
-#include "llvm/ModuleProvider.h"
-#include "llvm/ADT/OwningPtr.h"
#include "llvm/CodeGen/MachineCodeInfo.h"
#include "llvm/ExecutionEngine/JIT.h"
#include "llvm/CodeGen/MachineCodeInfo.h"
#include "llvm/ExecutionEngine/JIT.h"
-#include "llvm/Support/TypeBuilder.h"
-#include "llvm/Target/TargetSelect.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
+#include "llvm/IR/TypeBuilder.h"
+#include "llvm/Support/TargetSelect.h"
#include "gtest/gtest.h"
#include <vector>
using namespace llvm;
#include "gtest/gtest.h"
#include <vector>
using namespace llvm;
-int dummy;
-
-#if 0
namespace {
struct FunctionEmittedEvent {
namespace {
struct FunctionEmittedEvent {
@@
-47,7
+41,7
@@
struct RecordingJITEventListener : public JITEventListener {
std::vector<FunctionEmittedEvent> EmittedEvents;
std::vector<FunctionFreedEvent> FreedEvents;
std::vector<FunctionEmittedEvent> EmittedEvents;
std::vector<FunctionFreedEvent> FreedEvents;
-
int
NextIndex;
+
unsigned
NextIndex;
RecordingJITEventListener() : NextIndex(0) {}
RecordingJITEventListener() : NextIndex(0) {}
@@
-74,9
+68,11
@@
class JITEventListenerTest : public testing::Test {
}
Module *M;
}
Module *M;
- const
OwningP
tr<ExecutionEngine> EE;
+ const
std::unique_p
tr<ExecutionEngine> EE;
};
};
+// Tests on SystemZ disabled as we're running the old JIT
+#if !defined(__s390__) && !defined(__aarch64__)
Function *buildFunction(Module *M) {
Function *Result = Function::Create(
TypeBuilder<int32_t(int32_t), false>::get(getGlobalContext()),
Function *buildFunction(Module *M) {
Function *Result = Function::Create(
TypeBuilder<int32_t(int32_t), false>::get(getGlobalContext()),
@@
-227,6
+223,7
@@
TEST_F(JITEventListenerTest, MatchesMachineCodeInfo) {
EXPECT_EQ(1U, Listener.FreedEvents[0].Index);
EXPECT_EQ(F_addr, Listener.FreedEvents[0].Code);
}
EXPECT_EQ(1U, Listener.FreedEvents[0].Index);
EXPECT_EQ(F_addr, Listener.FreedEvents[0].Code);
}
+#endif
class JITEnvironment : public testing::Environment {
virtual void SetUp() {
class JITEnvironment : public testing::Environment {
virtual void SetUp() {
@@
-238,4
+235,3
@@
testing::Environment* const jit_env =
testing::AddGlobalTestEnvironment(new JITEnvironment);
} // anonymous namespace
testing::AddGlobalTestEnvironment(new JITEnvironment);
} // anonymous namespace
-#endif