Changeset 3286 in CLRX


Ignore:
Timestamp:
Sep 2, 2017, 7:38:33 AM (13 months ago)
Author:
matszpk
Message:

CLRadeonExtender: AsmGallium?: Fixed pushing control_directive content to binary.

Location:
CLRadeonExtender/trunk
Files:
2 edited

Legend:

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

    r3285 r3286  
    21462146                    symEntry.second.other });
    21472147        }
    2148    
    2149     /// checking symbols and set offset for kernels
     2148    // setup amd GPU arch values (for LLVM 4.0 HSA config)
    21502149    AMDGPUArchValues amdGpuArchValues = galliumAmdGpuArchValuesTbl[
    21512150                    cxuint(assembler.deviceType)];
     
    21542153    if (archStepping != BINGEN_DEFAULT)
    21552154        amdGpuArchValues.stepping = archStepping;
     2155    /// checking symbols and set offset for kernels
    21562156    AsmSection& asmCSection = assembler.sections[codeSection];
    21572157    const AsmSymbolMap& symbolMap = assembler.getSymbolMap();
     
    23752375                ::memcpy(outConfig.controlDirective,
    23762376                    assembler.sections[kernel.ctrlDirSection].content.data(), 128);
     2377            else
     2378                ::memset(outConfig.controlDirective, 0, 128);
    23772379           
    2378             ::memset(outConfig.controlDirective, 0, 128);
    23792380            if (asmCSection.content.size() >= symbol.value+256)
    23802381                ::memcpy(asmCSection.content.data() + symbol.value,
  • CLRadeonExtender/trunk/tests/amdasm/AsmGalliumFormat.cpp

    r3284 r3286  
    451451            .workgroup_fbarrier_count 3324
    452452            .hsa_sgprsnum 79
    453            
     453        .control_directive
     454        .int 1,2,4
     455       
    454456            .kernel aa23
    455457            .args
     
    474476aa23:
    475477    .skip 256
     478    .kernel aa22
     479    .control_directive
     480        .fill 116,1,0
    476481)ffDXD",
    477482       R"ffDXD(GalliumBinDump:
     
    511516      runtimeLoaderKernelSymbol=0x0
    512517      ControlDirective:
    513       0000000000000000000000000000000000000000000000000000000000000000
     518      0100000002000000040000000000000000000000000000000000000000000000
    514519      0000000000000000000000000000000000000000000000000000000000000000
    515520      0000000000000000000000000000000000000000000000000000000000000000
     
    565570  16000000640000001000000000000000fc0c00004f008b000000000000000000
    566571  6000620005040406ac4d03000000000000000000000000000000000000000000
    567   0000000000000000000000000000000000000000000000000000000000000000
     572  0100000002000000040000000000000000000000000000000000000000000000
    568573  0000000000000000000000000000000000000000000000000000000000000000
    569574  0000000000000000000000000000000000000000000000000000000000000000
Note: See TracChangeset for help on using the changeset viewer.