diff options
| author | Andrew M. B. Boktor <[email protected]> | 2012-05-03 09:57:30 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:19:37 -0700 |
| commit | e83f1eeb3329a29d29bca22fe2b919c71e3a611a (patch) | |
| tree | 33984770564d675e535f0900756d683dce1667fb /src/cuda-sim/ptx.y | |
| parent | c1dd9468c040b5304f7eaec5d8f6d9d0707c71c3 (diff) | |
1. Fixing ptx with sm_20
2. Fixing the choice of files (since new we can choose)
3. Not allowing sm_20 with PTXPlus, forcing max capability it to 19 and printing a warning
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12279]
Diffstat (limited to 'src/cuda-sim/ptx.y')
| -rw-r--r-- | src/cuda-sim/ptx.y | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y index 430fc00..8b65796 100644 --- a/src/cuda-sim/ptx.y +++ b/src/cuda-sim/ptx.y @@ -68,6 +68,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %token TEX_DIRECTIVE %token UNION_DIRECTIVE %token VERSION_DIRECTIVE +%token ADDRESS_SIZE_DIRECTIVE %token VISIBLE_DIRECTIVE %token <string_value> IDENTIFIER %token <int_value> INT_OPERAND @@ -251,6 +252,7 @@ statement_list: directive_statement { add_directive(); } directive_statement: variable_declaration SEMI_COLON | VERSION_DIRECTIVE DOUBLE_OPERAND { add_version_info($2, 0); } | VERSION_DIRECTIVE DOUBLE_OPERAND PLUS { add_version_info($2,1); } + | ADDRESS_SIZE_DIRECTIVE INT_OPERAND {/*Do nothing*/} | TARGET_DIRECTIVE IDENTIFIER COMMA IDENTIFIER { target_header2($2,$4); } | TARGET_DIRECTIVE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER { target_header3($2,$4,$6); } | TARGET_DIRECTIVE IDENTIFIER { target_header($2); } |