[PATCH] D127866: [NVPTX] Fix issues in ptxas integration to LIT tests
Andrew Savonichev via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 3 14:31:39 PDT 2022
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG5585d99835e8: [NVPTX] Fix issues in ptxas integration to LIT tests (authored by asavonic).
Changed prior to commit:
https://reviews.llvm.org/D127866?vs=437187&id=464817#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D127866/new/
https://reviews.llvm.org/D127866
Files:
llvm/test/CodeGen/NVPTX/atomicrmw-expand.ll
llvm/test/CodeGen/NVPTX/bug52623.ll
llvm/test/CodeGen/NVPTX/ldu-ldg.ll
llvm/test/lit.cfg.py
llvm/test/lit.site.cfg.py.in
Index: llvm/test/lit.site.cfg.py.in
===================================================================
--- llvm/test/lit.site.cfg.py.in
+++ llvm/test/lit.site.cfg.py.in
@@ -23,7 +23,7 @@
config.ocaml_flags = "@OCAMLFLAGS@"
config.include_go_tests = @LLVM_INCLUDE_GO_TESTS@
config.go_executable = "@GO_EXECUTABLE@"
-config.ptxas_executable = "@PXTAS_EXECUTABLE@"
+config.ptxas_executable = "@PTXAS_EXECUTABLE@"
config.enable_shared = @ENABLE_SHARED@
config.enable_assertions = @ENABLE_ASSERTIONS@
config.targets_to_build = "@TARGETS_TO_BUILD@"
Index: llvm/test/lit.cfg.py
===================================================================
--- llvm/test/lit.cfg.py
+++ llvm/test/lit.cfg.py
@@ -216,19 +216,23 @@
(11, 0), (11, 1), (11, 2), (11, 3), (11, 4), (11, 5), (11, 6),
]
+ def version_int(ver):
+ return ver[0] * 100 + ver[1]
+
# ignore ptxas if its version is below the minimum supported
# version
min_version = ptxas_known_versions[0]
- if version[0] < min_version[0] or version[1] < min_version[1]:
+ if version_int(version) < version_int(min_version):
print(
'Warning: ptxas version {}.{} is not supported'.format(
version[0], version[1]))
return
- for known_major, known_minor in ptxas_known_versions:
- if known_major <= version[0] and known_minor <= version[1]:
+ for known_version in ptxas_known_versions:
+ if version_int(known_version) <= version_int(version):
+ major, minor = known_version
config.available_features.add(
- 'ptxas-{}.{}'.format(known_major, known_minor))
+ 'ptxas-{}.{}'.format(major, minor))
config.available_features.add('ptxas')
tools.extend([ToolSubst('%ptxas', ptxas_executable),
Index: llvm/test/CodeGen/NVPTX/ldu-ldg.ll
===================================================================
--- llvm/test/CodeGen/NVPTX/ldu-ldg.ll
+++ llvm/test/CodeGen/NVPTX/ldu-ldg.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s
-; RUN: %if ptxas %{ llc < %s -march=nvptx -mcpu=sm_20 | %ptxas-verify %}
+; RUN: llc < %s -march=nvptx -mcpu=sm_32 | FileCheck %s
+; RUN: %if ptxas %{ llc < %s -march=nvptx -mcpu=sm_32 | %ptxas-verify %if !ptxas-11.0 %{-arch=sm_32%} %}
declare i8 @llvm.nvvm.ldu.global.i.i8.p1i8(i8 addrspace(1)* %ptr, i32 %align)
Index: llvm/test/CodeGen/NVPTX/bug52623.ll
===================================================================
--- llvm/test/CodeGen/NVPTX/bug52623.ll
+++ llvm/test/CodeGen/NVPTX/bug52623.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=nvptx -mcpu=sm_75 -verify-machineinstrs
-; RUN: %if ptxas %{ llc < %s -march=nvptx -mcpu=sm_75 | %ptxas-verify %}
+; RUN: llc < %s -march=nvptx -verify-machineinstrs
+; RUN: %if ptxas %{ llc < %s -march=nvptx | %ptxas-verify %}
; Check that llc will not crash even when first MBB doesn't contain
; any instruction.
Index: llvm/test/CodeGen/NVPTX/atomicrmw-expand.ll
===================================================================
--- llvm/test/CodeGen/NVPTX/atomicrmw-expand.ll
+++ llvm/test/CodeGen/NVPTX/atomicrmw-expand.ll
@@ -1,7 +1,7 @@
; RUN: llc < %s -march=nvptx64 -mcpu=sm_30 | FileCheck %s --check-prefixes=ALL,SM30
; RUN: llc < %s -march=nvptx64 -mcpu=sm_60 | FileCheck %s --check-prefixes=ALL,SM60
-; RUN: %if ptxas %{ llc < %s -march=nvptx64 -mcpu=sm_30 | %ptxas-verify %}
-; RUN: %if ptxas %{ llc < %s -march=nvptx64 -mcpu=sm_60 | %ptxas-verify %}
+; RUN: %if ptxas %{ llc < %s -march=nvptx64 -mcpu=sm_30 | %ptxas-verify %if !ptxas-11.0 %{-arch=sm_30%} %}
+; RUN: %if ptxas %{ llc < %s -march=nvptx64 -mcpu=sm_60 | %ptxas-verify -arch=sm_60 %}
; CHECK-LABEL: fadd_double
define void @fadd_double(ptr %0, double %1) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D127866.464817.patch
Type: text/x-patch
Size: 3849 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221003/cc4138d8/attachment.bin>
More information about the llvm-commits
mailing list