[GR-52910] Backport to 24.0: Fix caching of Regexps.

PullRequest: truffleruby/4219

CHANGELOG.md

@@ -3,6 +3,9 @@
 Bug fixes:
 * Fix `rb_global_variable()` for `Float` and bignum values during the `Init_` function (#3478, @eregon).
 
+Performance:
+* Fix inline caching for Regexp creation from Strings (#3492, @andrykonchin, @eregon).
+
 # 24.0.0
 
 New features:

spec/tags/truffle/splitting_tags.txt

@@ -1 +1,2 @@
 slow:Critical methods whic must split are under 100 AST nodes
+slow:Critical methods which must split are under 100 AST nodes

spec/truffle/regexp/inline_caching_spec.rb

@@ -0,0 +1,340 @@
+# truffleruby_primitives: true
+
+# Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 2.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+require_relative '../../ruby/spec_helper'
+
+# This test requires splitting (--engine.Splitting) which is only available with the OptimizedTruffleRuntime.
+# It fails under --experimental-engine-caching because CallInternalMethodNode does not have cached specializations for
+# !isSingleContext() and so ends up using an IndirectCallNode which prevents splitting.
+guard -> { TruffleRuby.jit? && !Truffle::Boot.get_option('experimental-engine-caching') && Truffle::Boot.get_option("default-cache") != 0 } do
+  describe "Inline caching for dynamically-created Regexp works for" do
+    before :each do
+      @performance_warnings, Warning[:performance] = Warning[:performance], true
+    end
+
+    after :each do
+      Warning[:performance] = @performance_warnings
+    end
+
+    it "Regexp.new" do
+      # Check that separate call sites with fixed input does not warn
+      -> {
+        Regexp.new("a")
+        Regexp.new("b")
+        Regexp.new("c")
+        Regexp.new("d")
+        Regexp.new("e")
+        Regexp.new("f")
+        Regexp.new("g")
+        Regexp.new("h")
+        Regexp.new("i")
+        Regexp.new("j")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |pattern|
+          Regexp.new(pattern)
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "Regexp.union with 1 argument" do
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        Regexp.union("a")
+        Regexp.union("b")
+        Regexp.union("c")
+        Regexp.union("d")
+        Regexp.union("e")
+        Regexp.union("f")
+        Regexp.union("g")
+        Regexp.union("h")
+        Regexp.union("i")
+        Regexp.union("j")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |pattern|
+          Regexp.union(pattern)
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "Regexp.union with multiple arguments" do
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        Regexp.union("h", "a")
+        Regexp.union("h", "b")
+        Regexp.union("h", "c")
+        Regexp.union("h", "d")
+        Regexp.union("h", "e")
+        Regexp.union("h", "f")
+        Regexp.union("h", "g")
+        Regexp.union("h", "h")
+        Regexp.union("h", "i")
+        Regexp.union("h", "j")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |pattern|
+          Regexp.union("h", pattern)
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "interpolated Regexp" do
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |pattern|
+          /#{pattern}/
+        end
+      }.should complain(/unstable interpolated regexps/)
+    end
+
+    it "String#scan" do
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        "zzz".scan("a")
+        "zzz".scan("b")
+        "zzz".scan("c")
+        "zzz".scan("d")
+        "zzz".scan("e")
+        "zzz".scan("f")
+        "zzz".scan("g")
+        "zzz".scan("h")
+        "zzz".scan("i")
+        "zzz".scan("j")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        # "a".."z" and not just "a".."j" because there can be some late heuristic megamorphic splitting by TRegex (ExecCompiledRegexNode)
+        ("a".."z").each do |pattern|
+          "zzz".scan(pattern)
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "String#sub" do
+      # Don't use String explicitly to trigger Truffle::Type.coerce_to_regexp. String argument is handled with
+      # Primitive.matchdata_create_single_group and isn't converted to Regexp immediately.
+      pattern = Class.new do
+        def initialize(string) = @string = string
+        def to_str = @string
+      end
+
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        "zzz".sub(pattern.new("a"), "replacement")
+        "zzz".sub(pattern.new("b"), "replacement")
+        "zzz".sub(pattern.new("c"), "replacement")
+        "zzz".sub(pattern.new("d"), "replacement")
+        "zzz".sub(pattern.new("e"), "replacement")
+        "zzz".sub(pattern.new("f"), "replacement")
+        "zzz".sub(pattern.new("g"), "replacement")
+        "zzz".sub(pattern.new("h"), "replacement")
+        "zzz".sub(pattern.new("i"), "replacement")
+        "zzz".sub(pattern.new("j"), "replacement")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |s|
+          "zzz".sub(pattern.new(s), "replacement")
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "String#sub!" do
+      # Don't use String explicitly to trigger Truffle::Type.coerce_to_regexp. String argument is handled with
+      # Primitive.matchdata_create_single_group and isn't converted to Regexp immediately.
+      pattern = Class.new do
+        def initialize(string) = @string = string
+        def to_str = @string
+      end
+
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        "zzz".sub!(pattern.new("a"), "replacement")
+        "zzz".sub!(pattern.new("b"), "replacement")
+        "zzz".sub!(pattern.new("c"), "replacement")
+        "zzz".sub!(pattern.new("d"), "replacement")
+        "zzz".sub!(pattern.new("e"), "replacement")
+        "zzz".sub!(pattern.new("f"), "replacement")
+        "zzz".sub!(pattern.new("g"), "replacement")
+        "zzz".sub!(pattern.new("h"), "replacement")
+        "zzz".sub!(pattern.new("i"), "replacement")
+        "zzz".sub!(pattern.new("j"), "replacement")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |s|
+          "zzz".sub!(pattern.new(s), "replacement")
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "String#gsub" do
+      # Don't use String explicitly to trigger Truffle::Type.coerce_to_regexp. String argument is handled with
+      # Primitive.matchdata_create_single_group and isn't converted to Regexp immediately.
+      pattern = Class.new do
+        def initialize(string) = @string = string
+        def to_str = @string
+      end
+
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        "zzz".gsub(pattern.new("a"), "replacement")
+        "zzz".gsub(pattern.new("b"), "replacement")
+        "zzz".gsub(pattern.new("c"), "replacement")
+        "zzz".gsub(pattern.new("d"), "replacement")
+        "zzz".gsub(pattern.new("e"), "replacement")
+        "zzz".gsub(pattern.new("f"), "replacement")
+        "zzz".gsub(pattern.new("g"), "replacement")
+        "zzz".gsub(pattern.new("h"), "replacement")
+        "zzz".gsub(pattern.new("i"), "replacement")
+        "zzz".gsub(pattern.new("j"), "replacement")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |s|
+          "zzz".gsub(pattern.new(s), "replacement")
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "String#gsub!" do
+      # Don't use String explicitly to trigger Truffle::Type.coerce_to_regexp. String argument is handled with
+      # Primitive.matchdata_create_single_group and isn't converted to Regexp immediately.
+      pattern = Class.new do
+        def initialize(string) = @string = string
+        def to_str = @string
+      end
+
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        "zzz".gsub!(pattern.new("a"), "replacement")
+        "zzz".gsub!(pattern.new("b"), "replacement")
+        "zzz".gsub!(pattern.new("c"), "replacement")
+        "zzz".gsub!(pattern.new("d"), "replacement")
+        "zzz".gsub!(pattern.new("e"), "replacement")
+        "zzz".gsub!(pattern.new("f"), "replacement")
+        "zzz".gsub!(pattern.new("g"), "replacement")
+        "zzz".gsub!(pattern.new("h"), "replacement")
+        "zzz".gsub!(pattern.new("i"), "replacement")
+        "zzz".gsub!(pattern.new("j"), "replacement")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |s|
+          "zzz".gsub!(pattern.new(s), "replacement")
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "String#match" do
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        "zzz".match("a")
+        "zzz".match("b")
+        "zzz".match("c")
+        "zzz".match("d")
+        "zzz".match("e")
+        "zzz".match("f")
+        "zzz".match("g")
+        "zzz".match("h")
+        "zzz".match("i")
+        "zzz".match("j")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |pattern|
+          "zzz".match(pattern)
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "String#match?" do
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        "zzz".match?("a")
+        "zzz".match?("b")
+        "zzz".match?("c")
+        "zzz".match?("d")
+        "zzz".match?("e")
+        "zzz".match?("f")
+        "zzz".match?("g")
+        "zzz".match?("h")
+        "zzz".match?("i")
+        "zzz".match?("j")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |pattern|
+          "zzz".match?(pattern)
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "Symbol#match" do
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        :zzz.match("a")
+        :zzz.match("b")
+        :zzz.match("c")
+        :zzz.match("d")
+        :zzz.match("e")
+        :zzz.match("f")
+        :zzz.match("g")
+        :zzz.match("h")
+        :zzz.match("i")
+        :zzz.match("j")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |pattern|
+          :zzz.match(pattern)
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+
+    it "Symbol#match?" do
+      # Check that separate call sites with fixed input do not warn
+      -> {
+        :zzz.match?("a")
+        :zzz.match?("b")
+        :zzz.match?("c")
+        :zzz.match?("d")
+        :zzz.match?("e")
+        :zzz.match?("f")
+        :zzz.match?("g")
+        :zzz.match?("h")
+        :zzz.match?("i")
+        :zzz.match?("j")
+      }.should_not complain
+
+      # Check that calling it with many different inputs has the warning
+      -> {
+        ("a".."z").each do |pattern|
+          :zzz.match?(pattern)
+        end
+      }.should complain(/unbounded creation of regexps/)
+    end
+  end
+end

spec/truffle/splitting_spec.rb

@@ -8,7 +8,7 @@
 
 require_relative '../ruby/spec_helper'
 
-describe 'Critical methods whic must split' do
+describe 'Critical methods which must split' do
   it 'are under 100 AST nodes' do
     code = <<-'EOF'
 require 'strscan'

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -202,6 +202,7 @@ public final class CoreLibrary {
     public final RubyModule truffleRegexpOperationsModule;
     public final RubyModule truffleRandomOperationsModule;
     public final RubyModule truffleThreadOperationsModule;
+    public final RubyModule truffleWarningOperationsModule;
     public final RubyClass encodingCompatibilityErrorClass;
     public final RubyClass encodingUndefinedConversionErrorClass;
     public final RubyClass methodClass;
@@ -508,6 +509,7 @@ public CoreLibrary(RubyContext context, RubyLanguage language) {
         defineModule(truffleModule, "ReadlineHistory");
         truffleRandomOperationsModule = defineModule(truffleModule, "RandomOperations");
         truffleThreadOperationsModule = defineModule(truffleModule, "ThreadOperations");
+        truffleWarningOperationsModule = defineModule(truffleModule, "WarningOperations");
         defineModule(truffleModule, "WeakRefOperations");
         handleClass = defineClass(truffleModule, objectClass, "Handle");
         warningModule = defineModule("Warning");

src/main/java/org/truffleruby/core/regexp/InterpolatedRegexpNode.java

@@ -15,7 +15,7 @@
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.regexp.InterpolatedRegexpNodeFactory.RegexpBuilderNodeGen;
 import org.truffleruby.core.string.TStringWithEncoding;
-import org.truffleruby.language.NotOptimizedWarningNode;
+import org.truffleruby.language.PerformanceWarningNode;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
@@ -103,8 +103,9 @@ Object fast(TStringWithEncoding[] parts,
 
         @Specialization(replaces = "fast")
         Object slow(TStringWithEncoding[] parts,
-                @Cached NotOptimizedWarningNode notOptimizedWarningNode) {
-            notOptimizedWarningNode.warn("unstable interpolated regexps are not optimized");
+                @Cached PerformanceWarningNode performanceWarningNode) {
+            performanceWarningNode.warn(
+                    "unstable interpolated regexps cause deoptimization loops which hurt performance significantly, avoid creating regexps dynamically where possible or cache them to fix this");
             return createRegexp(parts);
         }