Changeset 4944 in CLRX


Ignore:
Timestamp:
Sep 1, 2019, 3:52:09 PM (2 weeks ago)
Author:
matszpk
Message:

CLRadeonExtender: ROCm: First changes for LLVM10Bin ROCmBinGenerator.

Location:
CLRadeonExtender/trunk
Files:
3 edited

Legend:

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

    r4943 r4944  
    572572    }
    573573   
    574     uint32_t eflags = input->newBinFormat ? 2 : 0;
     574    uint32_t eflags = input->newBinFormat ? ((input->llvm10BinFormat) ? 51 : 2) : 0;
    575575    if (input->eflags != BINGEN_DEFAULT)
    576576        eflags = input->eflags;
     
    605605    addMainSectionToTable(mainSectionsNum, mainBuiltinSectTable, ELFSECTID_STRTAB);
    606606   
    607     elfBinGen64.reset(new ElfBinaryGen64({ 0U, 0U, 0x40, 0, ET_DYN, 0xe0, EV_CURRENT,
     607    const cxuint abiVer = (input->newBinFormat && input->llvm10BinFormat) ? 1 : 0;
     608   
     609    elfBinGen64.reset(new ElfBinaryGen64({ 0U, abiVer, 0x40, 0, ET_DYN, 0xe0, EV_CURRENT,
    608610            cxuint(input->newBinFormat ? execProgHeaderRegionIndex : UINT_MAX), 0, eflags },
    609611            true, true, true, PHREGION_FILESTART));
  • CLRadeonExtender/trunk/tests/amdbin/ROCmBinGen.cpp

    r3724 r4944  
    5757    rocmInput.metadata = binary.getMetadata();
    5858    rocmInput.newBinFormat = binary.isNewBinaryFormat();
     59    rocmInput.llvm10BinFormat = binary.isLLVM10BinaryFormat();
     60    rocmInput.metadataV3Format = binary.isMetadataV3Format();
    5961    rocmInput.globalDataSize = binary.getGlobalDataSize();
    6062    rocmInput.globalData = binary.getGlobalData();
  • CLRadeonExtender/trunk/tests/amdbin/ROCmMetadata.cpp

    r4915 r4944  
    13511351    rocmInput.archStepping = 3;
    13521352    rocmInput.newBinFormat = true;
     1353    rocmInput.llvm10BinFormat = false;
     1354    rocmInput.metadataV3Format = false;
    13531355    rocmInput.target = "amdgcn-amd-amdhsa-amdgizcl-gfx803";
    13541356    rocmInput.metadataSize = ::strlen(testCase.input);
Note: See TracChangeset for help on using the changeset viewer.