Changeset 3294 in CLRX


Ignore:
Timestamp:
Sep 2, 2017, 5:50:18 PM (15 months ago)
Author:
matszpk
Message:

CLRadeonExtender: AsmROCm: Do not print warnings about out of range when values was not parsed in
'.codeversion' and '.machine' pseudo-ops. fix typos. Small formatting in AsmGalliumFormat?.

Location:
CLRadeonExtender/trunk
Files:
3 edited

Legend:

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

    r3293 r3294  
    20592059            SLEV(outConfig.kernelCodePrefetchOffset, outConfig.kernelCodePrefetchOffset);
    20602060            SLEV(outConfig.kernelCodePrefetchSize, outConfig.kernelCodePrefetchSize);
    2061             SLEV(outConfig.maxScrachBackingMemorySize, outConfig.maxScrachBackingMemorySize);
     2061            SLEV(outConfig.maxScrachBackingMemorySize,
     2062                 outConfig.maxScrachBackingMemorySize);
    20622063            SLEV(outConfig.computePgmRsrc1, outConfig.computePgmRsrc1);
    20632064            SLEV(outConfig.computePgmRsrc2, outConfig.computePgmRsrc2);
    20642065            SLEV(outConfig.enableSgprRegisterFlags, outConfig.enableSgprRegisterFlags);
    20652066            SLEV(outConfig.enableFeatureFlags, outConfig.enableFeatureFlags);
    2066             SLEV(outConfig.workitemPrivateSegmentSize, outConfig.workitemPrivateSegmentSize);
    2067             SLEV(outConfig.workgroupGroupSegmentSize, outConfig.workgroupGroupSegmentSize);
     2067            SLEV(outConfig.workitemPrivateSegmentSize,
     2068                 outConfig.workitemPrivateSegmentSize);
     2069            SLEV(outConfig.workgroupGroupSegmentSize,
     2070                 outConfig.workgroupGroupSegmentSize);
    20682071            SLEV(outConfig.gdsSegmentSize, outConfig.gdsSegmentSize);
    20692072            SLEV(outConfig.kernargSegmentSize, outConfig.kernargSegmentSize);
     
    20802083                 outConfig.debugPrivateSegmentBufferSgpr);
    20812084            SLEV(outConfig.callConvention, outConfig.callConvention);
    2082             SLEV(outConfig.runtimeLoaderKernelSymbol, outConfig.runtimeLoaderKernelSymbol);
     2085            SLEV(outConfig.runtimeLoaderKernelSymbol,
     2086                 outConfig.runtimeLoaderKernelSymbol);
    20832087            // put control directive section to config
    20842088            if (kernel.ctrlDirSection!=ASMSECT_NONE &&
  • CLRadeonExtender/trunk/amdasm/AsmROCmFormat.cpp

    r3293 r3294  
    794794   
    795795    skipSpacesToEnd(linePtr, end);
    796     uint64_t kindValue = BINGEN_NOTSUPPLIED;
    797     uint64_t majorValue = BINGEN_NOTSUPPLIED;
    798     uint64_t minorValue = BINGEN_NOTSUPPLIED;
    799     uint64_t steppingValue = BINGEN_NOTSUPPLIED;
     796    uint64_t kindValue = 0;
     797    uint64_t majorValue = 0;
     798    uint64_t minorValue = 0;
     799    uint64_t steppingValue = 0;
    800800    const char* valuePlace = linePtr;
    801801    bool good = getAbsoluteValueArg(asmr, kindValue, linePtr, true);
     
    861861   
    862862    skipSpacesToEnd(linePtr, end);
    863     uint64_t majorValue = BINGEN_NOTSUPPLIED;
    864     uint64_t minorValue = BINGEN_NOTSUPPLIED;
     863    uint64_t majorValue = 0;
     864    uint64_t minorValue = 0;
    865865    const char* valuePlace = linePtr;
    866866    bool good = getAbsoluteValueArg(asmr, majorValue, linePtr, true);
     
    941941    if (haveFirstReg && haveLastReg && firstReg > lastReg)
    942942    {
    943         asmr.printError(valuePlace, "Wrong regsister range");
     943        asmr.printError(valuePlace, "Wrong register range");
    944944        good = false;
    945945    }
  • CLRadeonExtender/trunk/tests/amdasm/AsmROCmFormat.cpp

    r3256 r3294  
    453453        .skip 256
    454454        s_endpgm)ffDXD",
    455         "", R"ffDXD(test.s:6:28: Error: Wrong regsister range
    456 test.s:7:28: Error: Wrong regsister range
     455        "", R"ffDXD(test.s:6:28: Error: Wrong register range
     456test.s:7:28: Error: Wrong register range
    457457test.s:8:25: Error: First reserved VGPR register out of range (0-255)
    458458test.s:8:29: Error: Last reserved VGPR register out of range (0-255)
Note: See TracChangeset for help on using the changeset viewer.