8310711: [IR Framework] Remove safepoint while printing handling

Reviewed-by: thartmann, epeter

Author: chhagedorn

test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/CompilePhaseBlock.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@
  * This class represents a single compile phase block of a {@link LoggedMethod}.
  */
 class CompilePhaseBlock {
-    public static final String SAFEPOINT_WHILE_PRINTING_MESSAGE = "<!-- safepoint while printing -->";
 
     /**
      * Dummy object for a block that we do not need to parse.
@@ -38,11 +37,6 @@ class CompilePhaseBlock {
 
     private final CompilePhase compilePhase;
     private final StringBuilder builder;
-    /**
-     * Stores an incomplete line that was interrupted by a safepoint.
-     * Needs to be merged with the immediately following line.
-     */
-    private String incompleteLine = "";
 
     public CompilePhaseBlock(CompilePhase compilePhase) {
         this.compilePhase = compilePhase;
@@ -92,35 +86,14 @@ public static boolean isBlockEndLine(String line) {
     }
 
     public void addLine(String line) {
-        line = mergeWithIncompleteLine(line);
-        if (line.endsWith(SAFEPOINT_WHILE_PRINTING_MESSAGE)) {
-            line = removeSafepointMessage(line);
-            incompleteLine = line;
-        } else {
-            appendLine(line);
-        }
-    }
-
-    private String mergeWithIncompleteLine(String line) {
-        if (!incompleteLine.isEmpty()) {
-            line = incompleteLine + line;
-            incompleteLine = "";
-        }
-        return line;
-    }
+        builder.append(escapeXML(line)).append(System.lineSeparator());
 
-    private static String removeSafepointMessage(String line) {
-        return line.substring(0, line.lastIndexOf(SAFEPOINT_WHILE_PRINTING_MESSAGE));
     }
 
     public String content() {
         return builder.toString();
     }
 
-    private void appendLine(String line) {
-        builder.append(escapeXML(line)).append(System.lineSeparator());
-    }
-
     private static String escapeXML(String line) {
         if (line.contains("&")) {
             line = line.replace("&lt;", "<");

test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/State.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,26 +29,21 @@
  * This class holds the current state of the parsing of the hotspot_pid* file.
  */
 class State {
-    private final WriterThreads writerThreads;
-    private WriterThread writerThread;
     private final CompileQueueMessages compileQueueMessages;
     private final LoggedMethods loggedMethods;
     private LoggedMethod loggedMethod = LoggedMethod.DONT_CARE;
 
     public State(String testClassName, TestMethods testMethods) {
         this.compileQueueMessages = new CompileQueueMessages(testClassName, testMethods);
         this.loggedMethods = new LoggedMethods();
-        this.writerThreads = new WriterThreads();
     }
 
     public LoggedMethods loggedMethods() {
         return loggedMethods;
     }
 
     public void update(String line) {
-        if (WriterThread.isWriterThreadLine(line)) {
-            processWriterThreadLine(line);
-        } else if (compileQueueMessages.isTestMethodQueuedLine(line)) {
+        if (compileQueueMessages.isTestMethodQueuedLine(line)) {
             processCompileQueueLine(line);
         } else if (CompilePhaseBlock.isBlockStartLine(line)) {
             processBlockStartLine(line);
@@ -59,15 +54,6 @@ public void update(String line) {
         }
     }
 
-    private void processWriterThreadLine(String line) {
-        if (loggedMethod.hasActiveBlock()) {
-            // The current compile phase block was interrupted due to a safepoint. Save and restore later.
-            writerThread.saveLoggedMethod(loggedMethod);
-        }
-        writerThread = writerThreads.parse(line);
-        loggedMethod = writerThread.restoreLoggedMethod();
-    }
-
     private void processCompileQueueLine(String line) {
         String methodName = compileQueueMessages.parse(line);
         loggedMethods.registerMethod(methodName);