From 11d70b6b32b9f8b9eafe63563004ebd226c804dd Mon Sep 17 00:00:00 2001 From: Justin Holewinski Date: Fri, 6 May 2011 11:40:36 +0000 Subject: [PATCH] PTX: add PTX 2.3 language target Patch by Wei-Ren Chen llvm-svn: 130980 --- llvm/lib/Target/PTX/PTX.td | 4 ++++ llvm/lib/Target/PTX/PTXSubtarget.cpp | 1 + llvm/lib/Target/PTX/PTXSubtarget.h | 3 ++- llvm/test/CodeGen/PTX/options.ll | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/llvm/lib/Target/PTX/PTX.td b/llvm/lib/Target/PTX/PTX.td index ae8326e3199c..cf10f0c2f59c 100644 --- a/llvm/lib/Target/PTX/PTX.td +++ b/llvm/lib/Target/PTX/PTX.td @@ -38,6 +38,10 @@ def FeaturePTX22 : SubtargetFeature<"ptx22", "PTXVersion", "PTX_VERSION_2_2", "Use PTX Language Version 2.2", [FeaturePTX21]>; +def FeaturePTX23 : SubtargetFeature<"ptx23", "PTXVersion", "PTX_VERSION_2_3", + "Use PTX Language Version 2.3", + [FeaturePTX22]>; + //===- PTX Shader Model ---------------------------------------------------===// def FeatureSM10 : SubtargetFeature<"sm10", "PTXShaderModel", "PTX_SM_1_0", diff --git a/llvm/lib/Target/PTX/PTXSubtarget.cpp b/llvm/lib/Target/PTX/PTXSubtarget.cpp index a224f2b8be1a..e7542908e241 100644 --- a/llvm/lib/Target/PTX/PTXSubtarget.cpp +++ b/llvm/lib/Target/PTX/PTXSubtarget.cpp @@ -41,6 +41,7 @@ std::string PTXSubtarget::getPTXVersionString() const { case PTX_VERSION_2_0: return "2.0"; case PTX_VERSION_2_1: return "2.1"; case PTX_VERSION_2_2: return "2.2"; + case PTX_VERSION_2_3: return "2.3"; } } diff --git a/llvm/lib/Target/PTX/PTXSubtarget.h b/llvm/lib/Target/PTX/PTXSubtarget.h index 47d98424065b..3418d84128cd 100644 --- a/llvm/lib/Target/PTX/PTXSubtarget.h +++ b/llvm/lib/Target/PTX/PTXSubtarget.h @@ -37,7 +37,8 @@ namespace llvm { enum PTXVersionEnum { PTX_VERSION_2_0, /*< PTX Version 2.0 */ PTX_VERSION_2_1, /*< PTX Version 2.1 */ - PTX_VERSION_2_2 /*< PTX Version 2.2 */ + PTX_VERSION_2_2, /*< PTX Version 2.2 */ + PTX_VERSION_2_3 /*< PTX Version 2.3 */ }; /// Shader Model supported on the target GPU. diff --git a/llvm/test/CodeGen/PTX/options.ll b/llvm/test/CodeGen/PTX/options.ll index ac33fef0d6e3..92effa62a20e 100644 --- a/llvm/test/CodeGen/PTX/options.ll +++ b/llvm/test/CodeGen/PTX/options.ll @@ -1,6 +1,7 @@ ; RUN: llc < %s -march=ptx32 -mattr=ptx20 | grep ".version 2.0" ; RUN: llc < %s -march=ptx32 -mattr=ptx21 | grep ".version 2.1" ; RUN: llc < %s -march=ptx32 -mattr=ptx22 | grep ".version 2.2" +; RUN: llc < %s -march=ptx32 -mattr=ptx23 | grep ".version 2.3" ; RUN: llc < %s -march=ptx32 -mattr=sm10 | grep ".target sm_10" ; RUN: llc < %s -march=ptx32 -mattr=sm13 | grep ".target sm_13" ; RUN: llc < %s -march=ptx32 -mattr=sm20 | grep ".target sm_20"