/hg/icedtea6: Implemented Shark host CPU feature autotuner using...

[xranby at icedtea.classpath.org]

changeset 6dccdd4c25c7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6dccdd4c25c7
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Feb 17 14:46:46 2010 +0100

	Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs.

	2010-02-17 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::SharkCompiler): Implement host CPU feature
	autotuner using LLVM 2.7 APIs.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Define
	llvm/ADT/StringMap.h and llvm/System/Host.h depending on
	LLVM version. Allways define llvm/Support/CommandLine.h.


diffstat:

3 files changed, 38 insertions(+), 3 deletions(-)
ChangeLog                                          |   10 +++++++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp   |    5 ++-
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |   26 +++++++++++++++++++-

diffs (71 lines):

diff -r 8eb821cc2cd0 -r 6dccdd4c25c7 ChangeLog
--- a/ChangeLog	Tue Feb 16 15:54:50 2010 +0000
+++ b/ChangeLog	Wed Feb 17 14:46:46 2010 +0100
@@ -1,3 +1,13 @@ 2010-02-16  Gary Benson  <gbenson at redhat
+2010-02-17  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Implement host CPU feature
+	autotuner using LLVM 2.7 APIs.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Define llvm/ADT/StringMap.h and llvm/System/Host.h
+	depending on LLVM version.
+	Allways define llvm/Support/CommandLine.h.
+
 2010-02-16  Gary Benson  <gbenson at redhat.com>
 	
 	* contrib/jck/compile-native-code.sh: Add s390.
diff -r 8eb821cc2cd0 -r 6dccdd4c25c7 ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Tue Feb 16 15:54:50 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Feb 17 14:46:46 2010 +0100
@@ -42,10 +42,11 @@
 #include <llvm/Target/TargetSelect.h>
 #include <llvm/Type.h>
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
-#if SHARK_LLVM_VERSION < 27
 #include <llvm/Support/CommandLine.h>
-#else
+#if SHARK_LLVM_VERSION >= 27
+#include <llvm/ADT/StringMap.h>
 #include <llvm/Support/Debug.h>
+#include <llvm/System/Host.h>
 #endif
 
 #include <map>
diff -r 8eb821cc2cd0 -r 6dccdd4c25c7 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue Feb 16 15:54:50 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Wed Feb 17 14:46:46 2010 +0100
@@ -51,8 +51,32 @@ SharkCompiler::SharkCompiler()
   // Create the memory manager
   _memory_manager = new SharkMemoryManager();
 
+#if SHARK_LLVM_VERSION >= 27
+  // Finetune LLVM for the current host CPU.
+  StringMap<bool> Features;
+  bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features);
+  std::string cpu("-mcpu=" + llvm::sys::getHostCPUName());
+
+  std::vector<const char*> args;
+  args.push_back(""); // program name
+  args.push_back(cpu.c_str());
+
+  if(gotCpuFeatures){
+    std::string mattr("-mattr=");
+    for(StringMap<bool>::iterator I = Features.begin(),
+      E = Features.end(); I != E; ++I){
+      if(I->second){
+        std::string attr(I->first());
+        mattr+="+"+attr+",";
+      }
+    }
+    args.push_back(mattr.c_str());
+  }
+
+  args.push_back(0);  // terminator
+  cl::ParseCommandLineOptions(args.size() - 1, (char **) &args[0]);
+
   // Create the JIT
-#if SHARK_LLVM_VERSION >= 27
   _execution_engine = ExecutionEngine::createJIT(
     _normal_context->module(),
     NULL, memory_manager(), CodeGenOpt::Default);