Changeset 3704 in CLRX


Ignore:
Timestamp:
Feb 2, 2018, 8:30:45 PM (2 years ago)
Author:
matszpk
Message:

CLRadeonExtender: ROCmMetadata: Do not accept immediate # after 'Key:'. Skip short empty lines inside block. Update ROCmMetadata testsuite.

Location:
CLRadeonExtender/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

    r3698 r3704  
    129129    const char* afterColon = ptr;
    130130    skipSpacesToLineEnd(ptr, end);
    131     if (afterColon == ptr && ptr != end && *ptr!='\n' && *ptr!='#')
    132         // only if not immediate newline or comment
     131    if (afterColon == ptr && ptr != end && *ptr!='\n')
     132        // only if not immediate newline
    133133        throw ParseException(lineNo, "After key and colon must be space");
    134134    CString keyword(keyPtr, keyEnd);
     
    669669                continue;
    670670            }
    671             if (ptr-lineStart <= prevIndent)
     671            if (ptr-lineStart <= prevIndent && *ptr!='\n')
    672672            {
    673673                ptr = lineStart;
  • CLRadeonExtender/trunk/tests/amdbin/ROCmMetadata.cpp

    r3703 r3704  
    923923    SymbolName:      'vectorAdd@kd'
    924924    Language:        OpenCL C#aaaaaaaa
     925    XExex: aaaaaa 111
     926    XExex: [ 1,
     927    4,
     928    5 ] # aaaa
     929    XExey: |
     930      aaaa
     931      -----
     932     
     933      xxxxxx
     934    XExey: >
     935      aaaa
     936      -----
     937       
     938     
     939      xxxxxx
     940    XExey: >
     941      aaaa
     942      -----
     943       
     944      shorter empty line
     945   
     946      xxxxxx
    925947    LanguageVersion: [ 1
    926948  # ...............
     
    9831005        ValueType:       I8
    9841006        AddrSpaceQual:   Global
    985     CodeProps:#aaaaaa xxx
     1007    CodeProps: #aaaaaa xxx
    9861008      KernargSegmentSize: 64
    9871009      GroupSegmentFixedSize: 0
Note: See TracChangeset for help on using the changeset viewer.