Skip to content

S
swiftshader
Commit 6f8e565b by Ben Clayton
Options

Refactor LLVMReactor globals into 3 classes.

Split the scattered LLVM global variables into 3 new classes: • JITGlobals is a singleton that holds all the immutable machine specific information for the host device. • JITBuilder holds all the LLVM state for building routines. • JITRoutine is a rr::Routine that holds a LLVM JIT session, compiler and object layer as each routine may require different target machine settings and no Reactor routine directly links against another. This reduce all the global varibles to down to one - 'jit' a JITBuilder. In theory, this can be marked as TLS to remove the global reactor mutex lock. These change also make it possible to specify per-function JIT optimization settings (implemented in a follow-up change). Change-Id: If4c90de444830f398eb79081fd349f313a8d3bd7 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/33481Tested-by: 's avatarBen Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 18699c63
Showing with 0 additions and 102 deletions
CMakeLists.txt
...@@ -1668,8 +1668,6 @@ set(REACTOR_LLVM_LIST ...@@ -1668,8 +1668,6 @@ set(REACTOR_LLVM_LIST
${SOURCE_DIR}/Reactor/Nucleus.hpp ${SOURCE_DIR}/Reactor/Nucleus.hpp
${SOURCE_DIR}/Reactor/Routine.cpp ${SOURCE_DIR}/Reactor/Routine.cpp
${SOURCE_DIR}/Reactor/Routine.hpp ${SOURCE_DIR}/Reactor/Routine.hpp
${SOURCE_DIR}/Reactor/LLVMRoutine.cpp
${SOURCE_DIR}/Reactor/LLVMRoutine.hpp
${SOURCE_DIR}/Reactor/CPUID.cpp ${SOURCE_DIR}/Reactor/CPUID.cpp
${SOURCE_DIR}/Reactor/CPUID.hpp ${SOURCE_DIR}/Reactor/CPUID.hpp
${SOURCE_DIR}/Reactor/Debug.cpp ${SOURCE_DIR}/Reactor/Debug.cpp
......
build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj
...@@ -129,8 +129,6 @@ ...@@ -129,8 +129,6 @@
<ClInclude Include="$(SolutionDir)src\Reactor\Nucleus.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\Nucleus.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\Routine.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\Routine.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\Routine.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\Routine.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\LLVMRoutine.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\LLVMRoutine.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\CPUID.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\CPUID.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\CPUID.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\CPUID.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\Debug.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\Debug.cpp" />
......
build/Visual Studio 15 2017 Win64/ReactorLLVM.vcxproj.filters
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
<ClCompile Include="$(SolutionDir)src\Reactor\Routine.cpp"> <ClCompile Include="$(SolutionDir)src\Reactor\Routine.cpp">
<Filter>src\Reactor</Filter> <Filter>src\Reactor</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)src\Reactor\LLVMRoutine.cpp">
<Filter>src\Reactor</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\Reactor\CPUID.cpp"> <ClCompile Include="$(SolutionDir)src\Reactor\CPUID.cpp">
<Filter>src\Reactor</Filter> <Filter>src\Reactor</Filter>
</ClCompile> </ClCompile>
...@@ -39,9 +36,6 @@ ...@@ -39,9 +36,6 @@
<ClInclude Include="$(SolutionDir)src\Reactor\Routine.hpp"> <ClInclude Include="$(SolutionDir)src\Reactor\Routine.hpp">
<Filter>src\Reactor</Filter> <Filter>src\Reactor</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\Reactor\LLVMRoutine.hpp">
<Filter>src\Reactor</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\Reactor\CPUID.hpp"> <ClInclude Include="$(SolutionDir)src\Reactor\CPUID.hpp">
<Filter>src\Reactor</Filter> <Filter>src\Reactor</Filter>
</ClInclude> </ClInclude>
......
src/Android.bp
...@@ -177,7 +177,6 @@ cc_defaults { ...@@ -177,7 +177,6 @@ cc_defaults {
"Reactor/Reactor.cpp", "Reactor/Reactor.cpp",
"Reactor/LLVMReactor.cpp", "Reactor/LLVMReactor.cpp",
"Reactor/Routine.cpp", "Reactor/Routine.cpp",
"Reactor/LLVMRoutine.cpp",
"Reactor/Debug.cpp", "Reactor/Debug.cpp",
], ],
...@@ -198,7 +197,6 @@ cc_defaults { ...@@ -198,7 +197,6 @@ cc_defaults {
"Reactor/Reactor.cpp", "Reactor/Reactor.cpp",
"Reactor/LLVMReactor.cpp", "Reactor/LLVMReactor.cpp",
"Reactor/Routine.cpp", "Reactor/Routine.cpp",
"Reactor/LLVMRoutine.cpp",
"Reactor/Debug.cpp", "Reactor/Debug.cpp",
], ],
......
src/Android.mk
...@@ -69,7 +69,6 @@ COMMON_SRC_FILES += \ ...@@ -69,7 +69,6 @@ COMMON_SRC_FILES += \
else else
COMMON_SRC_FILES += \ COMMON_SRC_FILES += \
Reactor/LLVMReactor.cpp \ Reactor/LLVMReactor.cpp \
Reactor/LLVMRoutine.cpp \
Reactor/CPUID.cpp Reactor/CPUID.cpp
endif endif
......
src/Reactor/BUILD.gn
...@@ -327,7 +327,6 @@ if (supports_llvm) { ...@@ -327,7 +327,6 @@ if (supports_llvm) {
sources = [ sources = [
"CPUID.cpp", "CPUID.cpp",
"LLVMReactor.cpp", "LLVMReactor.cpp",
"LLVMRoutine.cpp",
] ]
configs = [ ":swiftshader_reactor_private_config" ] configs = [ ":swiftshader_reactor_private_config" ]
......
src/Reactor/LLVMReactor.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/Reactor/LLVMRoutine.cpp deleted 100644 → 0
// Copyright 2016 The SwiftShader Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "LLVMRoutine.hpp"
#include "ExecutableMemory.hpp"
#include "Thread.hpp"
namespace rr
{
LLVMRoutine::~LLVMRoutine()
{
dtor(reactorJIT, moduleKey);
}
}
src/Reactor/LLVMRoutine.hpp deleted 100644 → 0
// Copyright 2016 The SwiftShader Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef rr_LLVMRoutine_hpp
#define rr_LLVMRoutine_hpp
#include "Routine.hpp"
#include <cstdint>
#include <stddef.h>
#include <vector>
namespace rr
{
class LLVMReactorJIT;
class LLVMRoutine : public Routine
{
public:
LLVMRoutine(void **entries, size_t entry_count,
void (*callback)(LLVMReactorJIT *, uint64_t),
LLVMReactorJIT *jit, uint64_t key)
: entries(entries, entries+entry_count),
dtor(callback), reactorJIT(jit), moduleKey(key)
{ }
virtual ~LLVMRoutine();
const void *getEntry(int index)
{
return entries[index];
}
private:
const std::vector<const void *> entries;
void (*dtor)(LLVMReactorJIT *, uint64_t);
LLVMReactorJIT *reactorJIT;
uint64_t moduleKey;
};
}
#endif // rr_LLVMRoutine_hpp
src/Reactor/Reactor.vcxproj
...@@ -286,7 +286,6 @@ ...@@ -286,7 +286,6 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="CPUID.cpp" /> <ClCompile Include="CPUID.cpp" />
<ClCompile Include="Debug.cpp" /> <ClCompile Include="Debug.cpp" />
<ClCompile Include="LLVMRoutine.cpp" />
<ClCompile Include="LLVMReactor.cpp" /> <ClCompile Include="LLVMReactor.cpp" />
<ClCompile Include="LLVMReactorDebugInfo.cpp" /> <ClCompile Include="LLVMReactorDebugInfo.cpp" />
<ClCompile Include="ExecutableMemory.cpp" /> <ClCompile Include="ExecutableMemory.cpp" />
...@@ -299,7 +298,6 @@ ...@@ -299,7 +298,6 @@
<ClInclude Include="Debug.hpp" /> <ClInclude Include="Debug.hpp" />
<ClInclude Include="LLVMReactor.hpp" /> <ClInclude Include="LLVMReactor.hpp" />
<ClInclude Include="LLVMReactorDebugInfo.hpp" /> <ClInclude Include="LLVMReactorDebugInfo.hpp" />
<ClInclude Include="LLVMRoutine.hpp" />
<ClInclude Include="ExecutableMemory.hpp" /> <ClInclude Include="ExecutableMemory.hpp" />
<ClInclude Include="MutexLock.hpp" /> <ClInclude Include="MutexLock.hpp" />
<ClInclude Include="Nucleus.hpp" /> <ClInclude Include="Nucleus.hpp" />
......
src/Reactor/Reactor.vcxproj.filters
...@@ -18,9 +18,6 @@ ...@@ -18,9 +18,6 @@
<ClCompile Include="Routine.cpp"> <ClCompile Include="Routine.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="LLVMRoutine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LLVMReactor.cpp"> <ClCompile Include="LLVMReactor.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
...@@ -62,9 +59,6 @@ ...@@ -62,9 +59,6 @@
<ClInclude Include="LLVMReactorDebugInfo.hpp"> <ClInclude Include="LLVMReactorDebugInfo.hpp">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="LLVMRoutine.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CPUID.hpp"> <ClInclude Include="CPUID.hpp">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment