From 06fd5bf4ea122960f0435449c2391ea4fe1ea2ca Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 25 Apr 2013 03:47:41 +0000 Subject: Revert "Adding object caching support to MCJIT" This reverts commit 07f03923137a91e3cca5d7fc075a22f8c9baf33a. Looks like it broke the valgrind bot: http://lab.llvm.org:8011/builders/llvm-x86_64-linux-vg_leak/builds/649 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180249 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/ExecutionEngine/MCJIT/CMakeLists.txt | 1 - .../ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp | 240 --------------------- 2 files changed, 241 deletions(-) delete mode 100644 unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp (limited to 'unittests/ExecutionEngine') diff --git a/unittests/ExecutionEngine/MCJIT/CMakeLists.txt b/unittests/ExecutionEngine/MCJIT/CMakeLists.txt index 9ffe6138ad..c6b1f77e3e 100644 --- a/unittests/ExecutionEngine/MCJIT/CMakeLists.txt +++ b/unittests/ExecutionEngine/MCJIT/CMakeLists.txt @@ -10,7 +10,6 @@ set(LLVM_LINK_COMPONENTS set(MCJITTestsSources MCJITTest.cpp MCJITMemoryManagerTest.cpp - MCJITObjectCacheTest.cpp ) if(MSVC) diff --git a/unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp deleted file mode 100644 index 0061e30e7a..0000000000 --- a/unittests/ExecutionEngine/MCJIT/MCJITObjectCacheTest.cpp +++ /dev/null @@ -1,240 +0,0 @@ -//===- MCJITObjectCacheTest.cpp - Unit tests for MCJIT object caching -----===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#include "llvm/ADT/OwningPtr.h" -#include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/StringMap.h" -#include "llvm/ADT/StringSet.h" -#include "llvm/ExecutionEngine/JIT.h" -#include "llvm/ExecutionEngine/MCJIT.h" -#include "llvm/ExecutionEngine/ObjectCache.h" -#include "llvm/ExecutionEngine/SectionMemoryManager.h" -#include "MCJITTestBase.h" -#include "gtest/gtest.h" - -using namespace llvm; - -namespace { - -class TestObjectCache : public ObjectCache { -public: - TestObjectCache() : DuplicateInserted(false) { } - - virtual ~TestObjectCache() { - // Free any buffers we've allocated. - SmallVector::iterator it, end; - end = AllocatedBuffers.end(); - for (it = AllocatedBuffers.begin(); it != end; ++it) { - delete *it; - } - AllocatedBuffers.clear(); - } - - virtual void notifyObjectCompiled(const Module *M, const MemoryBuffer *Obj) { - // If we've seen this module before, note that. - const std::string ModuleID = M->getModuleIdentifier(); - if (ObjMap.find(ModuleID) != ObjMap.end()) - DuplicateInserted = true; - // Store a copy of the buffer in our map. - ObjMap[ModuleID] = copyBuffer(Obj); - } - - // Test-harness-specific functions - bool wereDuplicatesInserted() { return DuplicateInserted; } - - bool wasModuleLookedUp(const Module *M) { - return ModulesLookedUp.find(M->getModuleIdentifier()) - != ModulesLookedUp.end(); - } - - const MemoryBuffer* getObjectInternal(const Module* M) { - // Look for the module in our map. - const std::string ModuleID = M->getModuleIdentifier(); - StringMap::iterator it = ObjMap.find(ModuleID); - if (it == ObjMap.end()) - return 0; - return it->second; - } - -protected: - virtual const MemoryBuffer* getObject(const Module* M) { - const MemoryBuffer* BufferFound = getObjectInternal(M); - ModulesLookedUp.insert(M->getModuleIdentifier()); - return BufferFound; - } - -private: - MemoryBuffer *copyBuffer(const MemoryBuffer *Buf) { - // Create a local copy of the buffer. - MemoryBuffer *NewBuffer = MemoryBuffer::getMemBufferCopy(Buf->getBuffer()); - AllocatedBuffers.push_back(NewBuffer); - return NewBuffer; - } - - StringMap ObjMap; - StringSet<> ModulesLookedUp; - SmallVector AllocatedBuffers; - bool DuplicateInserted; -}; - -class MCJITObjectCacheTest : public testing::Test, public MCJITTestBase { -protected: - - enum { - OriginalRC = 6, - ReplacementRC = 7 - }; - - virtual void SetUp() { - M.reset(createEmptyModule("
")); - Main = insertMainFunction(M.get(), OriginalRC); - } - - void compileAndRun(int ExpectedRC = OriginalRC) { - // This function shouldn't be called until after SetUp. - ASSERT_TRUE(0 != TheJIT); - ASSERT_TRUE(0 != Main); - - TheJIT->finalizeObject(); - void *vPtr = TheJIT->getPointerToFunction(Main); - - static_cast(MM)->invalidateInstructionCache(); - - EXPECT_TRUE(0 != vPtr) - << "Unable to get pointer to main() from JIT"; - - int (*FuncPtr)(void) = (int(*)(void))(intptr_t)vPtr; - int returnCode = FuncPtr(); - EXPECT_EQ(returnCode, ExpectedRC); - } - - Function *Main; -}; - -TEST_F(MCJITObjectCacheTest, SetNullObjectCache) { - SKIP_UNSUPPORTED_PLATFORM; - - createJIT(M.take()); - - TheJIT->setObjectCache(NULL); - - compileAndRun(); -} - - -TEST_F(MCJITObjectCacheTest, VerifyBasicObjectCaching) { - SKIP_UNSUPPORTED_PLATFORM; - - OwningPtr Cache(new TestObjectCache); - - // Save a copy of the module pointer before handing it off to MCJIT. - const Module * SavedModulePointer = M.get(); - - createJIT(M.take()); - - TheJIT->setObjectCache(Cache.get()); - - // Verify that our object cache does not contain the module yet. - const MemoryBuffer *ObjBuffer = Cache->getObjectInternal(SavedModulePointer); - EXPECT_EQ(0, ObjBuffer); - - compileAndRun(); - - // Verify that MCJIT tried to look-up this module in the cache. - EXPECT_TRUE(Cache->wasModuleLookedUp(SavedModulePointer)); - - // Verify that our object cache now contains the module. - ObjBuffer = Cache->getObjectInternal(SavedModulePointer); - EXPECT_TRUE(0 != ObjBuffer); - - // Verify that the cache was only notified once. - EXPECT_FALSE(Cache->wereDuplicatesInserted()); -} - -TEST_F(MCJITObjectCacheTest, VerifyLoadFromCache) { - SKIP_UNSUPPORTED_PLATFORM; - - OwningPtr Cache(new TestObjectCache); - - // Compile this module with an MCJIT engine - createJIT(M.take()); - TheJIT->setObjectCache(Cache.get()); - TheJIT->finalizeObject(); - - // Destroy the MCJIT engine we just used - TheJIT.reset(); - - // Create a new memory manager. - MM = new SectionMemoryManager; - - // Create a new module and save it. Use a different return code so we can - // tell if MCJIT compiled this module or used the cache. - M.reset(createEmptyModule("
")); - Main = insertMainFunction(M.get(), ReplacementRC); - const Module * SecondModulePointer = M.get(); - - // Create a new MCJIT instance to load this module then execute it. - createJIT(M.take()); - TheJIT->setObjectCache(Cache.get()); - compileAndRun(); - - // Verify that MCJIT tried to look-up this module in the cache. - EXPECT_TRUE(Cache->wasModuleLookedUp(SecondModulePointer)); - - // Verify that MCJIT didn't try to cache this again. - EXPECT_FALSE(Cache->wereDuplicatesInserted()); -} - -TEST_F(MCJITObjectCacheTest, VerifyNonLoadFromCache) { - SKIP_UNSUPPORTED_PLATFORM; - - OwningPtr Cache(new TestObjectCache); - - // Compile this module with an MCJIT engine - createJIT(M.take()); - TheJIT->setObjectCache(Cache.get()); - TheJIT->finalizeObject(); - - // Destroy the MCJIT engine we just used - TheJIT.reset(); - - // Create a new memory manager. - MM = new SectionMemoryManager; - - // Create a new module and save it. Use a different return code so we can - // tell if MCJIT compiled this module or used the cache. Note that we use - // a new module name here so the module shouldn't be found in the cache. - M.reset(createEmptyModule("")); - Main = insertMainFunction(M.get(), ReplacementRC); - const Module * SecondModulePointer = M.get(); - - // Create a new MCJIT instance to load this module then execute it. - createJIT(M.take()); - TheJIT->setObjectCache(Cache.get()); - - // Verify that our object cache does not contain the module yet. - const MemoryBuffer *ObjBuffer = Cache->getObjectInternal(SecondModulePointer); - EXPECT_EQ(0, ObjBuffer); - - // Run the function and look for the replacement return code. - compileAndRun(ReplacementRC); - - // Verify that MCJIT tried to look-up this module in the cache. - EXPECT_TRUE(Cache->wasModuleLookedUp(SecondModulePointer)); - - // Verify that our object cache now contains the module. - ObjBuffer = Cache->getObjectInternal(SecondModulePointer); - EXPECT_TRUE(0 != ObjBuffer); - - // Verify that MCJIT didn't try to cache this again. - EXPECT_FALSE(Cache->wereDuplicatesInserted()); -} - -} // Namespace - -- cgit v1.2.3