[GR-17457] Be more flexible to detect the "Before lowering" phase

PullRequest: truffleruby/3299

Author: eregon

test/truffle/compiler/graphs/run.rb

@@ -3,15 +3,20 @@
 $tests = 0
 $failures = 0
 
-def test(program, extra = '', shape_expected)
+def test(program, shape_expected)
   $tests += 1
-  output = `bin/jt -q graph --json --describe #{program} #{extra}`
+  command = "bin/jt -q graph --json --describe #{program}"
+  output = `#{command}`
+  unless $?.success?
+    abort "`#{command}` failed (#{$?}).\nOutput:\n#{output}\n"
+  end
   last_line = output.lines.last.strip
 
   begin
     decoded = JSON.parse(last_line, symbolize_names: true)
   rescue JSON::ParserError => e
-    abort "#{program}: could not parse JSON (#{e}):\n#{output}"
+    abort "ERROR: Could not parse JSON from command `#{command}` (#{e}).\n" \
+      "JSON line:\n#{last_line}\nFull output:\n#{output}\n"
   end
 
   shape_got = decoded

tool/jt.rb

@@ -2150,15 +2150,19 @@ def graph(*args)
           method_glob_pattern = "Isolated:_#{method_glob_pattern}"
         end
 
-        dumps = Dir.glob('graal_dumps/*').sort.last
+        dumps = Dir.glob('graal_dumps/*').select { |path| File.directory?(path) }.sort.last
         raise 'Could not dump directory under graal_dumps/' unless dumps
         graphs = Dir.glob("#{dumps}/*\\[#{method_glob_pattern}*\\].bgv").sort
         graph = graphs.last
         raise "Could not find graph in #{dumps}" unless graph
 
         list = run_gem_test_pack_gem_or_install('seafoam', SEAFOAM_VERSION, '--json', graph, 'list', capture: :out, no_print_cmd: true)
         decoded = JSON.parse(list)
-        n = decoded.find { |entry| entry['graph_name_components'].last == 'Before phase org.graalvm.compiler.phases.common.LoweringPhase' }['graph_index']
+        graph_names = decoded.map { |entry| entry.fetch('graph_name_components').last }
+        before_lowering_regexp = /Before.+Lowering/
+        before_lowering = graph_names.index { |name| name =~ before_lowering_regexp }
+        raise "Could not find #{before_lowering_regexp.inspect} in #{graph_names}" unless before_lowering
+        n = decoded.fetch(before_lowering).fetch('graph_index')
 
         json_args = json ? %w[--json] : []
         action = describe ? 'describe' : 'render'