util.args: print required options explicitly in command usage

Author: c-refice

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/BinaryGraphPrinter.java

@@ -106,10 +106,7 @@ public BinaryGraphPrinter(DebugContext ctx, SnippetReflectionProvider snippetRef
 
     @SuppressWarnings("this-escape")
     public BinaryGraphPrinter(WritableByteChannel channel, SnippetReflectionProvider snippetReflection) throws IOException {
-        this.output = GraphOutput.newBuilder(this).
-                blocks(this).
-                elementsAndLocations(this, this).
-                types(this).build(channel);
+        this.output = GraphOutput.newBuilder(this).blocks(this).elementsAndLocations(this, this).types(this).build(channel);
         this.snippetReflection = snippetReflection;
     }
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/args/Command.java

@@ -223,17 +223,35 @@ private void verifyOptions(int nextPositionalArg) throws MissingArgumentExceptio
         }
     }
 
-    public void printUsage(PrintWriter writer) {
-        writer.append(getName());
-        if (!named.isEmpty()) {
+    protected void printOptionUsage(PrintWriter writer) {
+        boolean optionalFound = false;
+        var it = named.getEntries();
+        while (it.advance()) {
+            if (it.getValue().isRequired()) {
+                writer.append(String.format(" %s %s", it.getKey(), it.getValue().getUsage()));
+            } else {
+                optionalFound = true;
+            }
+        }
+        if (optionalFound) {
             writer.append(" [OPTIONS]");
         }
+
         for (OptionValue<?> option : positional) {
             writer.append(' ');
-            writer.append(option.getUsage());
+            if (option.isRequired()) {
+                writer.append(option.getUsage());
+            } else {
+                writer.append(String.format("[%s]", option.getUsage()));
+            }
         }
     }
 
+    public void printUsage(PrintWriter writer) {
+        writer.append(getName());
+        printOptionUsage(writer);
+    }
+
     public final void printHelp(PrintWriter writer) {
         printHelp(writer, 0);
     }