Merge pull request #3638 from rubinius/inline_cache

Reworked call site, inline cache mechanism.
rubinius · Apr 23, 2016 · f65a474 · f65a474
2 parents 54bed47 + 3b0777d
commit f65a474
Show file tree

Hide file tree

Showing 66 changed files with 1,084 additions and 2,023 deletions.
diff --git a/core/call_site.rb b/core/call_site.rb
@@ -1,23 +1,35 @@
 module Rubinius
   class CallSite
     attr_reader :name
-    attr_reader :executable
-
-    def hits
-      0
-    end
+    attr_reader :cache
 
     def ip
       Rubinius.primitive :call_site_ip
       raise PrimitiveFailure, "CallSite#ip primitive failed"
     end
 
-    def location
-      "#{@executable.file}:#{@executable.line_from_ip(ip)}"
+    def depth
+      Rubinius.primitive :call_site_depth
+      raise PrimitiveFailure, "CallSite#depth primitive failed"
+    end
+
+    def invokes
+      Rubinius.primitive :call_site_invokes
+      raise PrimitiveFailure, "CallSite#invokes primitive failed"
+    end
+
+    def hits
+      Rubinius.primitive :call_site_hits
+      raise PrimitiveFailure, "CallSite#hits primitive failed"
+    end
+
+    def misses
+      Rubinius.primitive :call_site_misses
+      raise PrimitiveFailure, "CallSite#misses primitive failed"
     end
 
     def inspect
-      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} #{location}##{@name}(#{hits})>"
+      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} name=#{@name} ip=#{ip} depth=#{depth} invokes=#{invokes} hits=#{hits} misses=#{misses}>"
     end
   end
 end
diff --git a/core/load_order.txt b/core/load_order.txt
@@ -77,7 +77,6 @@ metrics.rb
 mirror.rb
 missing_method.rb
 module.rb
-mono_inline_cache.rb
 mutex.rb
 native_method.rb
 nil.rb
@@ -88,7 +87,6 @@ options.rb
 pack.rb
 pointer.rb
 pointer_accessors.rb
-poly_inline_cache.rb
 proc.rb
 proc_mirror.rb
 process.rb

diff --git a/core/mono_inline_cache.rb b/core/mono_inline_cache.rb
diff --git a/core/poly_inline_cache.rb b/core/poly_inline_cache.rb
diff --git a/library/rubinius/configuration.rb b/library/rubinius/configuration.rb
@@ -168,6 +168,16 @@
   c.vm_variable "profiler.threshold", 1000000,
     "The minimum number of nanoseconds a profiler node must have to be reported"
 
+  c.section "machine" do |s|
+    s.section "call_site" do |cs|
+      cs.vm_variable "cache", true,
+        "Cache executables at call sites"
+
+      cs.vm_variable "limit", 3,
+        "Maximum number of caches at call sites"
+    end
+  end
+
   c.section "system" do |s|
     s.vm_variable "tmp", "$TMPDIR",
       "Default temp/fallback directory for the process"