Changeset 4965 in CLRX


Ignore:
Timestamp:
Sep 15, 2019, 4:18:31 PM (5 weeks ago)
Author:
matszpk
Message:

CLRadeonExtender: AsmROCm: Add new pseudo-ops. Rename '.shared_vgprsnum' to '.shared_vgprs'.

Location:
CLRadeonExtender/trunk
Files:
5 edited

Legend:

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

    r4964 r4965  
    5757    dx10Clamp = false;
    5858    pgmRsrc3 = 0;
    59     sharedVGPRsNum = 0;
     59    sharedVGPRsNum = BINGEN_DEFAULT;
    6060}
    6161
  • CLRadeonExtender/trunk/amdasm/AsmROCmFormat.cpp

    r4963 r4965  
    6060    "reserved_sgprs", "reserved_vgprs",
    6161    "runtime_handle", "runtime_loader_kernel_symbol",
    62     "scratchbuffer", "sgprsnum",
     62    "scratchbuffer", "sgprsnum", "shared_vgprs",
    6363    "spilledsgprs", "spilledvgprs", "target", "tgsize", "tripple",
    6464    "use_debug_enabled", "use_dispatch_id",
     
    100100    ROCMOP_RESERVED_SGPRS, ROCMOP_RESERVED_VGPRS,
    101101    ROCMOP_RUNTIME_HANDLE, ROCMOP_RUNTIME_LOADER_KERNEL_SYMBOL,
    102     ROCMOP_SCRATCHBUFFER, ROCMOP_SGPRSNUM, ROCMOP_SPILLEDSGPRS, ROCMOP_SPILLEDVGPRS,
     102    ROCMOP_SCRATCHBUFFER, ROCMOP_SGPRSNUM, ROCMOP_SHARED_VGPRS,
     103    ROCMOP_SPILLEDSGPRS, ROCMOP_SPILLEDVGPRS,
    103104    ROCMOP_TARGET, ROCMOP_TGSIZE, ROCMOP_TRIPPLE,
    104105    ROCMOP_USE_DEBUG_ENABLED, ROCMOP_USE_DISPATCH_ID,
     
    12631264            config.usedVGPRsNum = value;
    12641265            break;
     1266        case ROCMCVAL_SHARED_VGPRSNUM:
     1267            config.sharedVGPRsNum = value;
     1268            break;
    12651269        case ROCMCVAL_PGMRSRC1:
    12661270            config.computePgmRsrc1 = value;
     
    12681272        case ROCMCVAL_PGMRSRC2:
    12691273            config.computePgmRsrc2 = value;
     1274            break;
     1275        case ROCMCVAL_PGMRSRC3:
     1276            config.pgmRsrc3 = value;
    12701277            break;
    12711278        case ROCMCVAL_FLOATMODE:
     
    14841491        case ROCMCVAL_USE_XNACK_ENABLED:
    14851492            config.enableFeatureFlags |= ROCMFLAG_USE_XNACK_ENABLED;
     1493            break;
     1494        case ROCMCVAL_USE_WAVE32:
     1495            config.enableFeatureFlags |= ROCMFLAG_USE_WAVE32;
    14861496            break;
    14871497        default:
     
    20622072            break;
    20632073        case ROCMOP_PGMRSRC3:
     2074            AsmROCmPseudoOps::setConfigValue(*this, stmtPlace, linePtr, ROCMCVAL_PGMRSRC3);
    20642075            break;
    20652076        case ROCMOP_PRINTF:
     
    21022113                             ROCMCVAL_SGPRSNUM);
    21032114            break;
     2115        case ROCMOP_SHARED_VGPRS:
     2116            AsmROCmPseudoOps::setConfigValue(*this, stmtPlace, linePtr,
     2117                             ROCMCVAL_SHARED_VGPRSNUM);
     2118            break;
    21042119        case ROCMOP_TARGET:
    21052120            AsmROCmPseudoOps::setTarget(*this, linePtr, false);
     
    21622177            AsmROCmPseudoOps::setConfigBoolValue(*this, stmtPlace, linePtr,
    21632178                             ROCMCVAL_USE_XNACK_ENABLED);
     2179            break;
     2180        case ROCMOP_USE_WAVE32:
     2181            AsmROCmPseudoOps::setConfigBoolValue(*this, stmtPlace, linePtr,
     2182                             ROCMCVAL_USE_WAVE32);
    21642183            break;
    21652184        case ROCMOP_USERDATANUM:
  • CLRadeonExtender/trunk/amdasm/AsmROCmInternals.h

    r4963 r4965  
    8282    ROCMCVAL_CALL_CONVENTION,
    8383    ROCMCVAL_RUNTIME_LOADER_KERNEL_SYMBOL,
     84    ROCMCVAL_PGMRSRC3,
     85    ROCMCVAL_USE_WAVE32,
     86    ROCMCVAL_SHARED_VGPRSNUM,
    8487   
    8588    // metadata info
  • CLRadeonExtender/trunk/amdasm/DisasmROCm.cpp

    r4962 r4965  
    155155    if (arch >= GPUArchitecture::GCN1_5)
    156156    {
    157         bufSize = snprintf(buf, 100, "        .shared_vgprsnum %u\n",
     157        bufSize = snprintf(buf, 100, "        .shared_vgprs %u\n",
    158158                           (computePgmRsrc3 & 15)<<3);
    159159        output.write(buf, bufSize);
  • CLRadeonExtender/trunk/tests/amdasm/DisasmDataTest.cpp

    r4962 r4965  
    20132013        .sgprsnum 16
    20142014        .vgprsnum 4
    2015         .shared_vgprsnum 0
     2015        .shared_vgprs 0
    20162016        .dx10clamp
    20172017        .ieeemode
     
    20562056        .sgprsnum 16
    20572057        .vgprsnum 4
    2058         .shared_vgprsnum 0
     2058        .shared_vgprs 0
    20592059        .dx10clamp
    20602060        .ieeemode
Note: See TracChangeset for help on using the changeset viewer.