[llvm] [DebugInfo][RemoveDIs] Remove debug-intrinsic printing cmdline options (PR #131855)

[Orlando Cazalet-Hyams via llvm-commits]

================
@@ -1,57 +1,23 @@
 ;; Roundtrip tests.
 
-;; Load RemoveDIs mode in llvm-dis but write out debug intrinsics.
-; RUN: llvm-as --write-experimental-debuginfo-iterators-to-bitcode=true %s -o - \
-; RUN: | llvm-dis --load-bitcode-into-experimental-debuginfo-iterators=true --write-experimental-debuginfo=false \
-; RUN: | FileCheck %s
-
-;; Load and write RemoveDIs mode in llvm-dis.
-; RUN: llvm-as --write-experimental-debuginfo-iterators-to-bitcode=true %s -o - \
-; RUN: | llvm-dis --load-bitcode-into-experimental-debuginfo-iterators=true --write-experimental-debuginfo=true \
-; RUN: | FileCheck %s --check-prefixes=RECORDS
-
-;; Load intrinsics directly into the new format (auto-upgrade).
-; RUN: llvm-as --write-experimental-debuginfo-iterators-to-bitcode=false %s -o - \
-; RUN: | llvm-dis --load-bitcode-into-experimental-debuginfo-iterators=true --write-experimental-debuginfo=true \
-; RUN: | FileCheck %s --check-prefixes=RECORDS
-
-;; When preserving, we should output the format the bitcode was written in
-;; regardless of the value of the write flag.
-; RUN: llvm-as --write-experimental-debuginfo-iterators-to-bitcode=true %s -o - \
-; RUN: | llvm-dis --preserve-input-debuginfo-format=true --write-experimental-debuginfo=false \
+;; Tests that bitcode can be printed and interpreted by llvm-dis with non-intrinsic
+;; debug records -- llvm-as will autoupgrade.
+; RUN: llvm-as %s -o - \
+; RUN: | llvm-dis \
 ; RUN: | FileCheck %s --check-prefixes=RECORDS
 
-; RUN: llvm-as --write-experimental-debuginfo-iterators-to-bitcode=false %s -o - \
-; RUN: | llvm-dis --preserve-input-debuginfo-format=true --write-experimental-debuginfo=true \
-; RUN: | FileCheck %s
-
 ;; Check that verify-uselistorder passes regardless of input format.
-; RUN: llvm-as %s --write-experimental-debuginfo-iterators-to-bitcode=true -o - | verify-uselistorder
+; RUN: llvm-as %s -o - | verify-uselistorder
 ; RUN: verify-uselistorder %s
 
 ;; Confirm we're producing RemoveDI records from various tools.
-; RUN: opt %s -o - --write-experimental-debuginfo-iterators-to-bitcode=true | llvm-bcanalyzer - | FileCheck %s --check-prefix=BITCODE
-; RUN: llvm-as %s -o - --write-experimental-debuginfo-iterators-to-bitcode=true | llvm-bcanalyzer - | FileCheck %s --check-prefix=BITCODE
+; RUN: opt %s -o - | llvm-bcanalyzer - | FileCheck %s --check-prefix=BITCODE
+; RUN: llvm-as %s -o - | llvm-bcanalyzer - | FileCheck %s --check-prefix=BITCODE
 ; BITCODE-DAG: DEBUG_RECORD_LABEL
 ; BITCODE-DAG: DEBUG_RECORD_VALUE
 ; BITCODE-DAG: DEBUG_RECORD_ASSIGN
 ; BITCODE-DAG: DEBUG_RECORD_DECLARE
 
-;; Check that llvm-link doesn't explode if we give it different formats to
-;; link.
-;; NOTE: This test fails intermittently on linux if the llvm-as output is piped
-;; into llvm-link in the RUN lines below, unless the verify-uselistorder RUN
-;; lines above are removed. Write to a temporary file to avoid that weirdness.
-;; NOTE2: Unfortunately, the above only stopped it occuring on my machine.
-;; It failed again intermittently here:
-;; https://lab.llvm.org/buildbot/#/builders/245/builds/21930
-;; Allow this test to fail-over twice, until this strangeness is understood.
-; ALLOW_RETRIES: 2
----------------
OCHyams wrote:

hurray for deletion

https://github.com/llvm/llvm-project/pull/131855