From 2ed07329c2babbc39388dec8e19c6c78d1d41d46 Mon Sep 17 00:00:00 2001
From: Tor Aamodt <aamodt@ece.ubc.ca>
Date: Fri, 16 Jul 2010 18:09:06 -0800
Subject: - add placeholders for new (e.g., PTX 2.x) directives and
 instructions - update regression script to use compute sdk location for cuda
 (both   distributed in one download now)

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 6846]
---
 src/cuda-sim/ptx.y | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/cuda-sim/ptx.y')

diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y
index 2e1cb0f..bb10ae1 100644
--- a/src/cuda-sim/ptx.y
+++ b/src/cuda-sim/ptx.y
@@ -72,7 +72,10 @@
 %token <string_value> STRING
 %token <int_value>  OPCODE
 %token  ALIGN_DIRECTIVE
+%token  BRANCHTARGETS_DIRECTIVE
 %token  BYTE_DIRECTIVE
+%token  CALLPROTOTYPE_DIRECTIVE
+%token  CALLTARGETS_DIRECTIVE
 %token  CONST_DIRECTIVE
 %token  ENTRY_DIRECTIVE
 %token  EXTERN_DIRECTIVE
@@ -81,8 +84,14 @@
 %token  GLOBAL_DIRECTIVE
 %token  LOCAL_DIRECTIVE
 %token  LOC_DIRECTIVE
+%token  MAXNCTAPERSM_DIRECTIVE
+%token  MAXNNREG_DIRECTIVE
+%token  MAXNTID_DIRECTIVE
+%token  MINNCTAPERSM_DIRECTIVE
 %token  PARAM_DIRECTIVE
+%token  PRAGMA_DIRECTIVE
 %token  REG_DIRECTIVE
+%token  REQNTID_DIRECTIVE
 %token  SECTION_DIRECTIVE
 %token  SHARED_DIRECTIVE
 %token  SREG_DIRECTIVE
@@ -93,7 +102,6 @@
 %token  UNION_DIRECTIVE
 %token  VERSION_DIRECTIVE
 %token  VISIBLE_DIRECTIVE
-%token  MAXNTID_DIRECTIVE
 %token  <string_value> IDENTIFIER
 %token  <int_value> INT_OPERAND
 %token  <float_value> FLOAT_OPERAND
-- 
cgit v1.3