Changeset 182483 in webkit for trunk/Source/JavaScriptCore/llvm/InitializeLLVM.cpp

Timestamp:

Apr 7, 2015, 12:41:12 PM (10 years ago)

Author:

[email protected]

Message:

Make it possible to enable LLVM FastISel
​https://bugs.webkit.org/show_bug.cgi?id=143489

Reviewed by Michael Saboff.

The decision to enable FastISel is made by Options.h|cpp, but the LLVM library can disable it if it finds that it is built
against a version of LLVM that doesn't support it. Thereafter, JSC::enableLLVMFastISel is the flag that tells the system
if we should enable it.

• ftl/FTLCompile.cpp:

(JSC::FTL::mmAllocateDataSection):

• llvm/InitializeLLVM.cpp:

(JSC::initializeLLVMImpl):

• llvm/InitializeLLVM.h:
• llvm/InitializeLLVMLinux.cpp:

(JSC::getLLVMInitializerFunction):
(JSC::initializeLLVMImpl): Deleted.

• llvm/InitializeLLVMMac.cpp:

(JSC::getLLVMInitializerFunction):
(JSC::initializeLLVMImpl): Deleted.

• llvm/InitializeLLVMPOSIX.cpp:

(JSC::getLLVMInitializerFunctionPOSIX):
(JSC::initializeLLVMPOSIX): Deleted.

• llvm/InitializeLLVMPOSIX.h:
• llvm/InitializeLLVMWin.cpp:

(JSC::getLLVMInitializerFunction):
(JSC::initializeLLVMImpl): Deleted.

• llvm/LLVMAPI.cpp:
• llvm/LLVMAPI.h:
• llvm/library/LLVMExports.cpp:

(initCommandLine):
(initializeAndGetJSCLLVMAPI):

• runtime/Options.cpp:

(JSC::Options::initialize):

File:

• trunk/Source/JavaScriptCore/llvm/InitializeLLVM.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/llvm/InitializeLLVM.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30 +30 @@
 
 #include "LLVMAPI.h"
+#include "Options.h"
 #include <pthread.h>
+#include <wtf/DataLog.h>
 
 namespace JSC {
 
 static pthread_once_t initializeLLVMOnceKey = PTHREAD_ONCE_INIT;
+
+static void initializeLLVMImpl()
+{
+    const bool verbose =
+        Options::verboseFTLCompilation()
+        || Options::showFTLDisassembly()
+        || Options::verboseFTLFailure()
+        || Options::verboseCompilation()
+        || Options::showDFGDisassembly()
+        || Options::showDisassembly();
+    
+    LLVMInitializerFunction initializer = getLLVMInitializerFunction(verbose);
+    if (!initializer)
+        return;
+    
+    bool enableFastISel = Options::enableLLVMFastISel();
+    llvm = initializer(WTFLogAlwaysAndCrash, &enableFastISel);
+    if (!llvm) {
+        if (verbose)
+            dataLog("LLVM initilization failed.\n");
+    }
+    if (Options::enableLLVMFastISel() && !enableFastISel) {
+        if (verbose)
+            dataLog("Fast ISel requested but LLVM not new enough.\n");
+    }
+    
+    enableLLVMFastISel = enableFastISel;
+}
 
 bool initializeLLVM()