From 62f91c12629bf2498bf70facd1a8e5d9f5696e25 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Fri, 9 Dec 2022 00:54:39 +0300 Subject: [PATCH] [NFC] Port codegen NVPTX tests that invoke opt to `-passes=` syntax --- llvm/test/CodeGen/NVPTX/access-non-generic.ll | 4 ++-- llvm/test/CodeGen/NVPTX/intrinsic-old.ll | 10 +++++----- llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll | 2 +- llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll | 4 ++-- .../CodeGen/NVPTX/speculative-execution-divergent-target.ll | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/llvm/test/CodeGen/NVPTX/access-non-generic.ll b/llvm/test/CodeGen/NVPTX/access-non-generic.ll index 10f57ce..8710306 100644 --- a/llvm/test/CodeGen/NVPTX/access-non-generic.ll +++ b/llvm/test/CodeGen/NVPTX/access-non-generic.ll @@ -1,7 +1,7 @@ ; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s --check-prefix PTX ; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck %s --check-prefix PTX -; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=nvptx-- < %s -S -infer-address-spaces | FileCheck %s --check-prefix IR -; RUN: opt -temporarily-allow-old-pass-syntax -mtriple=nvptx64-- < %s -S -infer-address-spaces | FileCheck %s --check-prefix IR +; RUN: opt -mtriple=nvptx-- < %s -S -passes=infer-address-spaces | FileCheck %s --check-prefix IR +; RUN: opt -mtriple=nvptx64-- < %s -S -passes=infer-address-spaces | FileCheck %s --check-prefix IR ; RUN: %if ptxas %{ llc < %s -march=nvptx -mcpu=sm_20 | %ptxas-verify %} ; RUN: %if ptxas %{ llc < %s -march=nvptx64 -mcpu=sm_20 | %ptxas-verify %} diff --git a/llvm/test/CodeGen/NVPTX/intrinsic-old.ll b/llvm/test/CodeGen/NVPTX/intrinsic-old.ll index 678f50c..862226b 100644 --- a/llvm/test/CodeGen/NVPTX/intrinsic-old.ll +++ b/llvm/test/CodeGen/NVPTX/intrinsic-old.ll @@ -1,13 +1,13 @@ ; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck -allow-deprecated-dag-overlap %s ; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck -allow-deprecated-dag-overlap %s -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -nvvm-intr-range \ +; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-intr-range \ ; RUN: | FileCheck -allow-deprecated-dag-overlap --check-prefix=RANGE --check-prefix=RANGE_20 %s -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-intr-range \ +; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-intr-range \ ; RUN: | FileCheck -allow-deprecated-dag-overlap --check-prefix=RANGE --check-prefix=RANGE_20 %s -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda \ -; RUN: -nvvm-intr-range -nvvm-intr-range-sm=30 \ +; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda \ +; RUN: -passes=nvvm-intr-range -nvvm-intr-range-sm=30 \ ; RUN: | FileCheck -allow-deprecated-dag-overlap --check-prefix=RANGE --check-prefix=RANGE_30 %s -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda \ +; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda \ ; RUN: -passes=nvvm-intr-range -nvvm-intr-range-sm=30 \ ; RUN: | FileCheck -allow-deprecated-dag-overlap --check-prefix=RANGE --check-prefix=RANGE_30 %s ; RUN: %if ptxas %{ llc < %s -march=nvptx -mcpu=sm_20 | %ptxas-verify %} diff --git a/llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll b/llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll index 75425d5..714cac1 100644 --- a/llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll +++ b/llvm/test/CodeGen/NVPTX/math-intrins-sm80-ptx70-instcombine.ll @@ -1,4 +1,4 @@ -; RUN: opt -temporarily-allow-old-pass-syntax < %s -instcombine -S -mtriple=nvptx-nvidia-cuda -march=nvptx64 \ +; RUN: opt < %s -passes=instcombine -S -mtriple=nvptx-nvidia-cuda -march=nvptx64 \ ; RUN: -mcpu=sm_80 -mattr=+ptx70 | \ ; RUN: FileCheck %s diff --git a/llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll b/llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll index e79fa8a..845001b 100644 --- a/llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll +++ b/llvm/test/CodeGen/NVPTX/nvvm-reflect-module-flag.ll @@ -1,5 +1,5 @@ -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -nvvm-reflect | FileCheck %s -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-reflect | FileCheck %s +; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-reflect | FileCheck %s +; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -passes=nvvm-reflect | FileCheck %s declare i32 @__nvvm_reflect(i8*) @str = private unnamed_addr addrspace(1) constant [11 x i8] c"__CUDA_FTZ\00" diff --git a/llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll b/llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll index 89597a9..f2be923 100644 --- a/llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll +++ b/llvm/test/CodeGen/NVPTX/speculative-execution-divergent-target.ll @@ -1,12 +1,12 @@ ; Checks that speculative-execution only runs on divergent targets, if you pass ; -spec-exec-only-if-divergent-target. -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -speculative-execution | \ +; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -passes=speculative-execution | \ ; RUN: FileCheck --check-prefix=ON %s -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -mtriple=nvptx-nvidia-cuda -speculative-execution \ +; RUN: opt < %s -S -mtriple=nvptx-nvidia-cuda -passes=speculative-execution \ ; RUN: -spec-exec-only-if-divergent-target | \ ; RUN: FileCheck --check-prefix=ON %s -; RUN: opt -temporarily-allow-old-pass-syntax < %s -S -speculative-execution -spec-exec-only-if-divergent-target | \ +; RUN: opt < %s -S -passes=speculative-execution -spec-exec-only-if-divergent-target | \ ; RUN: FileCheck --check-prefix=OFF %s ; Hoist in if-then pattern. -- 2.7.4