Use long option names; split nvdisasm into outputs and display options

app.py

@@ -13,10 +13,17 @@ def find_tool(name):
 
 
 TOOLS = {name: find_tool(name) for name in ("cuobjdump", "nvdisasm")}
-FLAGS = {
-    "cuobjdump": ["-sass", "-ptx", "-elf", "-res-usage", "-symbols", "-lelf", "-lptx"],
-    "nvdisasm": ["-c", "-g", "-gi", "-hex", "-print-life-ranges", "-print-raw", "-print-line-info", "-cfg", "-bbcfg"],
+OUTPUTS = {
+    "cuobjdump": ["--dump-sass", "--dump-ptx", "--dump-elf", "--dump-resource-usage", "--dump-elf-symbols",
+                  "--list-elf", "--list-ptx"],
+    "nvdisasm": ["--print-code", "--output-control-flow-graph", "--output-control-flow-graph-with-basic-blocks"],
 }
+MODIFIERS = {
+    "cuobjdump": [],
+    "nvdisasm": ["--print-instruction-encoding", "--print-life-ranges", "--print-raw", "--print-line-info",
+                 "--print-line-info-inline"],
+}
+EXTRA_EXAMPLE = {"cuobjdump": "--function vecadd", "nvdisasm": "--emit-json"}
 EXAMPLES = sorted(str(p) for p in Path(__file__).with_name("examples").glob("*.cubin"))
 
 
@@ -32,12 +39,18 @@ def run_one(tool, args, file):
     return (r.stdout + r.stderr or "(no output)") + (f"\n[exit code {r.returncode}]" if r.returncode else "")
 
 
-def run(file, tool, flags, extra):
+def run(file, tool, outputs, modifiers, extra):
     if file is None:
         return {"error": "Upload a cubin first."}
-    extra = shlex.split(extra or "")
-    return {" ".join([f, *extra]): run_one(tool, [f, *extra], file) for f in flags} or \
-           {" ".join(extra) or tool: run_one(tool, extra, file)}
+    common = [*modifiers, *shlex.split(extra or "")]
+    return {" ".join(args): run_one(tool, args, file) for args in ([o, *common] for o in outputs)} or \
+           {" ".join(common) or tool: run_one(tool, common, file)}
+
+
+def select_tool(tool):
+    return (gr.CheckboxGroup(OUTPUTS[tool], value=OUTPUTS[tool]),
+            gr.CheckboxGroup(MODIFIERS[tool], value=[], visible=bool(MODIFIERS[tool])),
+            gr.Textbox(placeholder=EXTRA_EXAMPLE[tool]))
 
 
 with gr.Blocks(title="cuobjdump / nvdisasm") as demo:
@@ -49,9 +62,10 @@ with gr.Blocks(title="cuobjdump / nvdisasm") as demo:
             file = gr.File(label="cubin / fatbin / CUDA ELF", type="filepath")
         with gr.Column(scale=2):
             tool = gr.Radio(list(TOOLS), value="cuobjdump", label="Tool")
-            flags = gr.CheckboxGroup(FLAGS["cuobjdump"], value=FLAGS["cuobjdump"], label="Flags (each runs separately with its own output)")
+            outputs = gr.CheckboxGroup(OUTPUTS["cuobjdump"], value=OUTPUTS["cuobjdump"], label="Outputs (each runs separately)")
+            modifiers = gr.CheckboxGroup(MODIFIERS["cuobjdump"], label="Display options (applied to every run)", visible=False)
             with gr.Row(equal_height=True):
-                extra = gr.Textbox(label="Extra arguments", placeholder="-fun vecadd", scale=4)
+                extra = gr.Textbox(label="Extra arguments", placeholder=EXTRA_EXAMPLE["cuobjdump"], scale=4)
                 btn = gr.Button("Run", variant="primary", scale=1)
     gr.Examples(EXAMPLES, file)
     results = gr.State({})
@@ -61,8 +75,8 @@ with gr.Blocks(title="cuobjdump / nvdisasm") as demo:
         for label, output in results.items():
             gr.Code(output, label=label, max_lines=60)
 
-    tool.change(lambda t: gr.CheckboxGroup(FLAGS[t], value=FLAGS[t]), tool, flags)
-    btn.click(run, [file, tool, flags, extra], results)
+    tool.change(select_tool, tool, [outputs, modifiers, extra])
+    btn.click(run, [file, tool, outputs, modifiers, extra], results)
 
 if __name__ == "__main__":
     demo.launch()