Changeset 161498 in webkit

Timestamp:

Jan 8, 2014 7:21:27 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Make FTL buildable
​https://bugs.webkit.org/show_bug.cgi?id=125777

Patch by Dániel Bátyai <Dániel Bátyai> on 2014-01-08
Reviewed by Csaba Osztrogonác.

.:

• Source/cmake/OptionsEfl.cmake:
• Source/cmakeconfig.h.cmake:

Source/JavaScriptCore:

• CMakeLists.txt:
• ftl/FTLOSREntry.cpp:
• ftl/FTLOSRExitCompiler.cpp:
• llvm/library/config_llvm.h:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/CMakeLists.txt (modified) (5 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/llvm/InitializeLLVMLinux.cpp (copied) (copied from trunk/Source/JavaScriptCore/llvm/library/config_llvm.h) (3 diffs)
• Source/JavaScriptCore/llvm/library/config_llvm.h (modified) (1 diff)
• Source/cmake/FindLLVM.cmake (added)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)
• Source/cmakeconfig.h.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2014-01-08  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
+
+        [EFL] Make FTL buildable
+        https://bugs.webkit.org/show_bug.cgi?id=125777
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2014-01-08  Alberto Garcia  <berto@igalia.com>
 

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -17 +17 @@
     "${JAVASCRIPTCORE_DIR}/jit"
     "${JAVASCRIPTCORE_DIR}/llint"
+    "${JAVASCRIPTCORE_DIR}/llvm"
     "${JAVASCRIPTCORE_DIR}/parser"
     "${JAVASCRIPTCORE_DIR}/profiler"
@@ -577 +578 @@
 endif ()
 
+if (ENABLE_FTL_JIT)
+    if (NOT LLVM_STATIC_LIBRARIES)
+        message(FATAL_ERROR "No LLVM libs found, but FTL is enabled. Stopping build.")
+    endif ()
+
+    # Configure llvmForJSC.so
+    set(llvmForJSC_SOURCES
+        llvm/library/LLVMAnchor.cpp
+        llvm/library/LLVMExports.cpp
+        llvm/library/LLVMOverrides.cpp
+    )
+    set(llvmForJSC_INCLUDE_DIRECTORIES
+        ${LLVM_INCLUDE_DIRS}
+        "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+    )
+
+    add_custom_command(
+        OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h
+        DEPENDS ${LLVM_STATIC_LIBRARIES}
+        COMMAND ${CMAKE_COMMAND} -E touch ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h
+        VERBATIM)
+
+    WEBKIT_WRAP_SOURCELIST(${llvmForJSC_SOURCES})
+    add_library(llvmForJSC SHARED ${llvmForJSC_SOURCES} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h)
+    target_link_libraries(llvmForJSC ${LLVM_STATIC_LIBRARIES} "pthread" "dl")
+
+    # Added extra items for JavaScriptCore
+    list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+        ${LLVM_INCLUDE_DIRS}
+    )
+
+    list(APPEND JavaScriptCore_SOURCES
+        llvm/InitializeLLVM.cpp
+        llvm/InitializeLLVMPOSIX.cpp
+        llvm/InitializeLLVMLinux.cpp
+        llvm/LLVMAPI.cpp
+
+        dfg/DFGToFTLDeferredCompilationCallback.cpp
+        dfg/DFGToFTLForOSREntryDeferredCompilationCallback.cpp
+
+        disassembler/LLVMDisassembler.cpp
+        disassembler/X86Disassembler.cpp
+
+        ftl/FTLAbstractHeap.cpp
+        ftl/FTLAbstractHeapRepository.cpp
+        ftl/FTLCapabilities.cpp
+        ftl/FTLCommonValues.cpp
+        ftl/FTLCompile.cpp
+        ftl/FTLExitArgument.cpp
+        ftl/FTLExitArgumentForOperand.cpp
+        ftl/FTLExitThunkGenerator.cpp
+        ftl/FTLExitValue.cpp
+        ftl/FTLFail.cpp
+        ftl/FTLForOSREntryJITCode.cpp
+        ftl/FTLInlineCacheSize.cpp
+        ftl/FTLIntrinsicRepository.cpp
+        ftl/FTLJITCode.cpp
+        ftl/FTLJITFinalizer.cpp
+        ftl/FTLLink.cpp
+        ftl/FTLLocation.cpp
+        ftl/FTLLowerDFGToLLVM.cpp
+        ftl/FTLOSREntry.cpp
+        ftl/FTLOSRExit.cpp
+        ftl/FTLOSRExitCompiler.cpp
+        ftl/FTLOutput.cpp
+        ftl/FTLSaveRestore.cpp
+        ftl/FTLSlowPathCall.cpp
+        ftl/FTLSlowPathCallKey.cpp
+        ftl/FTLStackMaps.cpp
+        ftl/FTLState.cpp
+        ftl/FTLThunks.cpp
+        ftl/FTLValueFormat.cpp
+    )
+endif ()
+
 set(HASH_LUT_GENERATOR ${CMAKE_CURRENT_SOURCE_DIR}/create_hash_table)
 macro(GENERATE_HASH_LUT _input _output)
@@ -597 +673 @@
     bindings
     bytecode
-    collector/handles
     debugger
     heap
@@ -608 +683 @@
     runtime
     yarr
+
+    collector/handles
 )
 
@@ -772 +849 @@
     install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
 endif ()
+
+if (ENABLE_FTL_JIT)
+    add_dependencies(JavaScriptCore llvmForJSC)
+endif ()

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-08  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
+
+        [EFL] Make FTL buildable
+        https://bugs.webkit.org/show_bug.cgi?id=125777
+
+        Reviewed by Csaba Osztrogonác.
+
+        * CMakeLists.txt:
+        * ftl/FTLOSREntry.cpp:
+        * ftl/FTLOSRExitCompiler.cpp:
+        * llvm/library/config_llvm.h:
+
 2014-01-08  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/JavaScriptCore/llvm/InitializeLLVMLinux.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 University of Szeged. All rights reserved.
+ * Copyright (C) 2013 Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11 +12 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -21 +22 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <wtf/Platform.h>
-#include <wtf/ExportMacros.h>
+#include "config.h"
+#include "InitializeLLVM.h"
 
+#if HAVE(LLVM)
+
+#include "InitializeLLVMPOSIX.h"
+
+namespace JSC {
+
+void initializeLLVMImpl()
+{
+    initializeLLVMPOSIX("libllvmForJSC.so");
+}
+
+} // namespace JSC
+
+#endif // HAVE(LLVM)

trunk/Source/JavaScriptCore/llvm/library/config_llvm.h

@@ -24 +24 @@
  */
 
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#endif
+#endif
 #include <wtf/Platform.h>
 #include <wtf/ExportMacros.h>

trunk/Source/cmake/OptionsEfl.cmake

@@ -282 +282 @@
     add_definitions(-DWTF_USE_LEVELDB=1)
 endif ()
+
+if (ENABLE_FTL_JIT)
+    find_package(LLVM REQUIRED)
+    set(HAVE_LLVM ON)
+endif ()

trunk/Source/cmakeconfig.h.cmake

@@ -43 +43 @@
 #cmakedefine01 ENABLE_FIXED_REPORTED_SIZE
 #cmakedefine01 ENABLE_FTPDIR
+#cmakedefine01 ENABLE_FTL_JIT
 #cmakedefine01 ENABLE_FONT_LOAD_EVENTS
 #cmakedefine01 ENABLE_FULLSCREEN_API
@@ -126 +127 @@
 #cmakedefine01 USE_SYSTEM_MALLOC
 #cmakedefine01 WTF_USE_TILED_BACKING_STORE
+#cmakedefine01 HAVE_LLVM
 
 #endif /* CMAKECONFIG_H */