Changeset 3731 in CLRX


Ignore:
Timestamp:
Feb 6, 2018, 10:12:04 PM (17 months ago)
Author:
matszpk
Message:

CLRadeonExtender: ROCmBinGen: Print kernels if kernels exists (not printfs!). AsmROCm: fixed handling errors in '.arg' pseudo-op.
Fixed sorting of the valuekinds and typo in access qualifier names. Fixed Config value for kernarg_segment_size.

Location:
CLRadeonExtender/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CLRadeonExtender/trunk/amdasm/AsmROCmFormat.cpp

    r3730 r3731  
    799799{
    800800    { "complact", cxuint(ROCmValueKind::HIDDEN_COMPLETION_ACTION) },
     801    { "defqueue", cxuint(ROCmValueKind::HIDDEN_DEFAULT_QUEUE) },
    801802    { "dynshptr", cxuint(ROCmValueKind::DYN_SHARED_PTR) },
    802     { "defqueue", cxuint(ROCmValueKind::HIDDEN_DEFAULT_QUEUE) },
    803803    { "globalbuf", cxuint(ROCmValueKind::GLOBAL_BUFFER) },
    804804    { "globaloffsetx", cxuint(ROCmValueKind::HIDDEN_GLOBAL_OFFSET_X) },
     
    865865    { "read_only", cxuint(ROCmAccessQual::READ_ONLY) },
    866866    { "read_write", cxuint(ROCmAccessQual::READ_WRITE) },
    867     { "write_inly", cxuint(ROCmAccessQual::WRITE_ONLY) }
     867    { "write_only", cxuint(ROCmAccessQual::WRITE_ONLY) }
    868868};
    869869
     
    10111011        char name[20];
    10121012        const char* fieldPlace = linePtr;
    1013         good &= getNameArg(asmr, 20, name, linePtr, "argument flag", true);
     1013        if (!getNameArg(asmr, 20, name, linePtr, "argument flag", true))
     1014        {
     1015            good = false;
     1016            break;
     1017        }
    10141018       
    10151019        if (::strcmp(name, "const")==0)
     
    10221026            argIsPipe = true;
    10231027        else
     1028        {
    10241029            ASM_NOTGOOD_BY_ERROR(fieldPlace, "Unknown argument flag")
     1030            break;
     1031        }
    10251032    }
    10261033   
     
    19921999        case ROCMOP_MD_KERNARG_SEGMENT_SIZE:
    19932000            AsmROCmPseudoOps::setConfigValue(*this, stmtPlace, linePtr,
    1994                             ROCMCVAL_MD_KERNARG_SEGMENT_ALIGN);
     2001                            ROCMCVAL_MD_KERNARG_SEGMENT_SIZE);
    19952002            break;
    19962003        case ROCMOP_MD_LANGUAGE:
  • CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

    r3730 r3731  
    16111611    }
    16121612   
    1613     if (!mdInfo.printfInfos.empty())
     1613    if (!mdInfo.kernels.empty())
    16141614        output += "Kernels:         \n";
    16151615    // kernels
Note: See TracChangeset for help on using the changeset viewer.