[flang][test] Remove RUN COMMANDS/EXPECTED OUTPUT/INPUT markers from test/Driver

[MaskRay]

Summary

Uses of these markers are contrary to all other llvm-project subprojects
and carry no information for people who know the basics of a lit test.

I understand that there is an argument "this makes beginners get started
quickly" but I am unsure whether this is strong enough to deviate from
all other projects. https://llvm.org/docs/TestingGuide.html covers the
basics.

[peixin]

Agree. When I read it at first time, I am also confused and feel strange.

[clementval]

+1. One can be confused those lines are something like run lines.

[rovka]

Missed a spot ;) Otherwise LGTM

flang/test/Driver/dump-pft.f90

4–5

4–5

[MaskRay]

remove two omitted comment blocks

[awarzynski]

There are similar markers in other files too:

grep -IEr "\-\-\-" -l  flang/test/Driver/
flang/test/Driver/macro-multiline.F90
flang/test/Driver/debug-parsing-log.f90
flang/test/Driver/driver-help.f90
flang/test/Driver/driver-help-hidden.f90
flang/test/Driver/output-paths.f90
flang/test/Driver/driver-error-cc1.c
flang/test/Driver/driver-error-cc1.cpp
flang/test/Driver/cpp-nocpp-command-line-macro.f90
flang/test/Driver/input-from-stdin.f90
flang/test/Driver/use-module-error.f90
flang/test/Driver/parse-fir-error.ll
flang/test/Driver/mllvm.f90
flang/test/Driver/fno-integrated-as.f90
flang/test/Driver/input-from-stdin-llvm.ll
flang/test/Driver/fixed-line-length.f90
flang/test/Driver/predefined-macros-compiler-version.F90
flang/test/Driver/cpp-nocpp-predefined-macro.F90
flang/test/Driver/emit-llvm.f90
flang/test/Driver/save-temps.f90
flang/test/Driver/default-backend-pipelines.f90
flang/test/Driver/implicit-none.f90
flang/test/Driver/print-effective-triple.f90
flang/test/Driver/module-suffix.f90
flang/test/Driver/mllvm_vs_mmlir.f90
flang/test/Driver/werror-scan.f
flang/test/Driver/unparse-use-analyzed.f95
flang/test/Driver/dump-all.f90
flang/test/Driver/default-optimization-pipelines.f90
flang/test/Driver/intrinsic-module-path.f90
flang/test/Driver/escaped-backslash.f90
flang/test/Driver/parse-error.ll
flang/test/Driver/missing-input.f90
flang/test/Driver/target.f90
flang/test/Driver/dump-parse-tree-no-sema.f90
flang/test/Driver/print-target-triple.f90
flang/test/Driver/flarge-sizes.f90
flang/test/Driver/fdefault.f90
flang/test/Driver/syntax-only.f90
flang/test/Driver/werror-parse.f
flang/test/Driver/use-module.f90
flang/test/Driver/include-header.f90
flang/test/Driver/fixed-free-detection.f90
flang/test/Driver/debug-provenance.f90
flang/test/Driver/write-module.f90
flang/test/Driver/flang_f_opts.f90
flang/test/Driver/dump-all-bad.f90
flang/test/Driver/fixed-free-flag.f90
flang/test/Driver/werror-sema.f90
flang/test/Driver/include-omp-header.f90
flang/test/Driver/parse-ir-error.f95
flang/test/Driver/std2018-wrong.f90
flang/test/Driver/debug-measure-parse-tree.f90
flang/test/Driver/get-definition.f90
flang/test/Driver/phases.f90
flang/test/Driver/pic-flags.f90
flang/test/Driver/werror-wrong.f90
flang/test/Driver/std2018.f90
flang/test/Driver/missing-arg.f90
flang/test/Driver/macro-def-undef.F90
flang/test/Driver/driver-version.f90

Why not update all of them?

flang/test/Driver/code-gen-aarch64.f90

 ! Test -emit-obj (X86)
 
 ! REQUIRES: aarch64-registered-target, x86-registered-target
 
-!-------------
-! RUN COMMANDS
-!-------------
 ! RUN: rm -f %t.o
 ! RUN: %flang_fc1 -emit-obj -triple aarch64-unknown-linux-gnu %s -o %t.o
 ! RUN: llvm-objdump --triple aarch64-unknown-linux-gnu --disassemble-all %t.o | FileCheck %s --check-prefix=CORRECT_TRIPLE
 ! RUN: rm -f %t.o
 ! RUN: %flang -c --target=aarch64-unknown-linux-gnu %s -o %t.o
 ! RUN: llvm-objdump --triple aarch64-unknown-linux-gnu --disassemble-all %t.o | FileCheck %s --check-prefix=CORRECT_TRIPLE
 
 ! RUN: %flang -c --target=aarch64-unknown-linux-gnu %s -o %t.o
 ! RUN: llvm-objdump --triple x86_64-unknown-linux-gnu --disassemble-all %t.o | FileCheck %s --check-prefix=INCORRECT_TRIPLE
 
-!----------------
-! EXPECTED OUTPUT
-!----------------
 ! CORRECT_TRIPLE-LABEL: <_QQmain>:
 ! CORRECT_TRIPLE-NEXT:    ret
 
 ! When incorrect triple is used to disassemble, there won't be a ret instruction at all.
 ! INCORRECT_TRIPLE-LABEL: <_QQmain>:
 ! INCORRECT_TRIPLE-NOT:   ret
 
-!------
-! INPUT
-!------
 end program

flang/test/Driver/code-gen-x86.f90

 ! Test -emit-obj (X86)
 
 ! REQUIRES: x86-registered-target, aarch64-registered-target
 ! UNSUPPORTED: darwin, macos
 
-!-------------
-! RUN COMMANDS
-!-------------
 ! RUN: rm -f %t.o
 ! RUN: %flang_fc1 -triple x86_64-unknown-linux-gnu -emit-obj %s -o %t.o
 ! RUN: llvm-objdump --triple x86_64-unknown-linux-gnu --disassemble-all %t.o | FileCheck %s --check-prefix=CORRECT_TRIPLE
 ! RUN: rm -f %t.o
 ! RUN: %flang --target=x86_64-unknown-linux-gnu -c %s -o %t.o
 ! RUN: llvm-objdump --triple x86_64-unknown-linux-gnu --disassemble-all %t.o | FileCheck %s --check-prefix=CORRECT_TRIPLE
 
 ! RUN: %flang -c --target=x86_64-unknown-linux-gnu %s -o %t.o
 ! RUN: llvm-objdump --triple aarch64-unknown-linux-gnu --disassemble-all %t.o | FileCheck %s --check-prefix=INCORRECT_TRIPLE
 
-!----------------
-! EXPECTED OUTPUT
-!----------------
 ! CORRECT_TRIPLE-LABEL: <_QQmain>:
 ! CORRECT_TRIPLE-NEXT:    retq
 
 ! When incorrect triple is used to disassemble, there won't be a ret(q) instruction at all.
 ! INCORRECT_TRIPLE-LABEL: <_QQmain>:
 ! INCORRECT_TRIPLE-NOT:   ret
 
-!------
-! INPUT
-!------
 end program

flang/test/Driver/dump-pft.f90

-!-------------
-! RUN COMMANDS
-!-------------
 ! RUN: %flang_fc1 -fdebug-dump-parse-tree %s 2>&1 | FileCheck %s --check-prefix=PARSE_TREE
 ! RUN: %flang_fc1 -fdebug-dump-pft %s 2>&1 | FileCheck %s --check-prefix=PFT
 ! RUN: bbc -pft-test %s 2>&1 | FileCheck %s --check-prefix=PFT
 
-!-----------------
-! EXPECTEED OUTPUT
-!-----------------
 ! PFT: 1 Subroutine test_routine: subroutine test_routine(a, b, n)
 ! PFT-NEXT:  1 EndSubroutineStmt: end subroutine
 ! PRF-NEXT: End Subroutine test_routine
 ! PFT-NO: Program -> ProgramUnit -> SubroutineSubprogram
 
 ! PARSE_TREE: Program -> ProgramUnit -> SubroutineSubprogram
 ! PARSE_TREE-NEXT: | SubroutineStmt
 ! PARSE_TREE-NEXT: | | Name = 'test_routine'
 ! PARSE_TREE-NEXT: | | DummyArg -> Name = 'a'
 ! PARSE_TREE-NEXT: | | DummyArg -> Name = 'b'
 ! PARSE_TREE-NEXT: | | DummyArg -> Name = 'n'
 ! PARSE_TREE-NEXT: | SpecificationPart
 ! PARSE_TREE-NEXT: | | ImplicitPart ->
 ! PARSE_TREE-NEXT: | ExecutionPart -> Block
 ! PARSE_TREE-NEXT: | EndSubroutineStmt ->
 ! PARSE_TREE-NO: Subroutine test_routine: subroutine test_routine(a, b, n)
 
-!-------
-! INPUT
-!-------
 subroutine test_routine(a, b, n)
 end subroutine

flang/test/Driver/emit-asm-aarch64.f90

 ! Test -S (AArch64)
 
 ! REQUIRES: aarch64-registered-target
 
-!-------------
-! RUN COMMANDS
-!-------------
 ! RUN: %flang_fc1 -S -triple aarch64-unknown-linux-gnu %s -o - | FileCheck %s
 ! RUN: %flang -S -target aarch64-unknown-linux-gnu %s -o - | FileCheck %s
 
-!----------------
-! EXPECTED OUTPUT
-!----------------
 ! CHECK-LABEL: _QQmain:
 ! CHECK-NEXT: .Lfunc_begin0:
 ! CHECK: ret
 
-!------
-! INPUT
-!------
 end program

flang/test/Driver/emit-asm-from-llvm-bc.ll

 ; Verify that the driver can consume LLVM BC files.
 
 ; REQUIRES: aarch64-registered-target
 
-;-------------
-; RUN COMMANDS
-;-------------
 ; RUN: rm -f %t.bc
 ; RUN: %flang_fc1 -triple aarch64-unknown-linux-gnu -emit-llvm-bc %s -o %t.bc
 ; RUN: %flang_fc1 -S -triple aarch64-unknown-linux-gnu -o - %t.bc | FileCheck %s
 ; RUN: rm -f %t.bc
 
 ; RUN: rm -f %t.bc
 ; RUN: %flang -c -target aarch64-unknown-linux-gnu -emit-llvm %s -o %t.bc
 ; RUN: %flang -S -target aarch64-unknown-linux-gnu -o - %t.bc | FileCheck %s
 ; RUN: rm -f %t.bc
 
-;----------------
-; EXPECTED OUTPUT
-;----------------
 ; CHECK-LABEL: foo:
 ; CHECK: ret
 
-;------
-; INPUT
-;------
 define void @foo() {
   ret void
 }

flang/test/Driver/emit-asm-from-llvm.ll

 ; Verify that the driver can consume LLVM IR files.
 
 ; REQUIRES: aarch64-registered-target
 
-;-------------
-; RUN COMMANDS
-;-------------
 ; RUN: %flang_fc1 -S -triple aarch64-unknown-linux-gnu %s -o - | FileCheck %s
 ; RUN: %flang -S -target aarch64-unknown-linux-gnu %s -o - | FileCheck %s
 
-;----------------
-; EXPECTED OUTPUT
-;----------------
 ; CHECK-LABEL: foo:
 ; CHECK: ret
 
-;------
-; INPUT
-;------
 define void @foo() {
   ret void
 }

flang/test/Driver/emit-asm-from-mlir.mlir

 ; Verify that the driver can consume MLIR/FIR files.
 
-;-------------
-; RUN COMMANDS
-;-------------
 ; RUN: %flang_fc1 -S %s -o - | FileCheck %s
 
-;----------------
-; EXPECTED OUTPUT
-;----------------
 ; CHECK-LABEL: foo:
 ; CHECK: ret
 
-;------
-; INPUT
-;------
 func.func @foo() {
   return
 }

flang/test/Driver/emit-asm-x86.f90

 ! Test -S (X86)
 
 ! REQUIRES: x86-registered-target
 
-!-------------
-! RUN COMMANDS
-!-------------
 ! RUN: %flang_fc1 -S -triple x86_64-unknown-linux-gnu %s -o - | FileCheck %s
 ! RUN: %flang -S -target x86_64-unknown-linux-gnu %s -o - | FileCheck %s
 
-!----------------
-! EXPECTED OUTPUT
-!----------------
 ! CHECK-LABEL: _QQmain:
 ! CHECK-NEXT: .Lfunc_begin0:
 ! CHECK: ret
 
-!------
-! INPUT
-!------
 end program

flang/test/Driver/emit-llvm-bc.f90

 ! Test the options for generating LLVM byte-code `-emit-llvm-bc` option
 
-!-------------
-! RUN COMMANDS
-!-------------
 ! RUN: %flang -emit-llvm -c %s -o - | llvm-dis -o - | FileCheck %s
 ! RUN: %flang_fc1 -emit-llvm-bc %s -o - | llvm-dis -o - | FileCheck %s
 
-!----------------
-! EXPECTED OUTPUT
-!----------------
 ! CHECK: define void @_QQmain()
 ! CHECK-NEXT:  ret void
 ! CHECK-NEXT: }
 
-!------
-! INPUT
-!------
 end program

flang/test/Driver/emit-mlir.f90

 ! Test the `-emit-mlir` option
 
-!-------------
-! RUN COMMANDS
-!-------------
 ! RUN: %flang_fc1 -emit-mlir %s -o - | FileCheck %s
 ! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
 
 ! Verify that an `.mlir` file is created when `-emit-mlir` is used. Do it in a temporary directory, which will be cleaned up by the
 ! LIT runner.
 ! RUN: rm -rf %t-dir && mkdir -p %t-dir && cd %t-dir
 ! RUN: cp %s .
 ! RUN: %flang_fc1 -emit-mlir emit-mlir.f90 && ls emit-mlir.mlir
 
-!----------------
-! EXPECTED OUTPUT
-!----------------
 ! CHECK: module attributes {
 ! CHECK-LABEL: func @_QQmain() {
 ! CHECK-NEXT:  return
 ! CHECK-NEXT: }
 ! CHECK-NEXT: }
 
-!------
-! INPUT
-!------
 end program

flang/test/Driver/linker-flags.f90

 ! Verify that the Fortran runtime libraries are present in the linker
 ! invocation. These libraries are added on top of other standard runtime
 ! libraries that the Clang driver will include.
 
-!-------------
-! RUN COMMANDS
-!-------------
 ! RUN: %flang -### -flang-experimental-exec -target ppc64le-linux-gnu %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,GNU
 ! RUN: %flang -### -flang-experimental-exec -target aarch64-apple-darwin %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,DARWIN
 ! RUN: %flang -### -flang-experimental-exec -target x86_64-windows-gnu %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,MINGW
 
 ! NOTE: Clang's driver library, clangDriver, usually adds 'libcmt' and
 !       'oldnames' on Windows, but they are not needed when compiling
 !       Fortran code and they might bring in additional dependencies.
 !       Make sure they're not added.
 ! RUN: %flang -### -flang-experimental-exec -target aarch64-windows-msvc %S/Inputs/hello.f90 2>&1 | FileCheck %s --check-prefixes=CHECK,MSVC --implicit-check-not libcmt --implicit-check-not oldnames
 
-!----------------
-! EXPECTED OUTPUT
-!----------------
 ! Compiler invocation to generate the object file
 ! CHECK-LABEL: {{.*}} "-emit-obj"
 ! CHECK-SAME:  "-o" "[[object_file:.*\.o]]" {{.*}}Inputs/hello.f90
 
 ! Linker invocation to generate the executable
 ! GNU-LABEL:  "{{.*}}ld" 
 ! GNU-SAME: "[[object_file]]"
 ! GNU-SAME: -lFortran_main

flang/test/Driver/missing-triple.ll

 ; Verify that the module triple is overridden by the driver - even when the
 ; module triple is missing.
 ; NOTE: At the time of writing, the tested behaviour was consistent with Clang
 
-;-------------
-; RUN COMMANDS
-;-------------
 ; RUN: %flang_fc1 -S %s -o - 2>&1 | FileCheck %s
 ; RUN: %flang -S  %s -o - 2>&1 | FileCheck %s
 
-;----------------
-; EXPECTED OUTPUT
-;----------------
 ; CHECK: warning: overriding the module target triple with {{.*}}
 
-;------
-; INPUT
-;------
 define void @foo() {
   ret void
 }

flang/test/Driver/override-triple.ll

 ; Verify that the module triple is overridden by the driver - even in the presence
 ; of a module triple.
 ; NOTE: At the time of writing, the tested behaviour was consistent with Clang
 
-;-------------
-; RUN COMMANDS
-;-------------
 ; RUN: %flang_fc1 -S %s -o - 2>&1 | FileCheck %s
 ; RUN: %flang -S  %s -o - 2>&1 | FileCheck %s
 
-;----------------
-; EXPECTED OUTPUT
-;----------------
 ; CHECK: warning: overriding the module target triple with {{.*}}
 
-;------
-; INPUT
-;------
 ; For the triple to be overridden by the driver, it needs to be different to the host triple.
 ; Use a random string to guarantee that.
 target triple = "invalid-triple"
 
 define void @foo() {
   ret void
 }