Changeset 3808 in CLRX


Ignore:
Timestamp:
Feb 16, 2018, 4:12:26 PM (14 months ago)
Author:
matszpk
Message:

CLRadeonExtender: AsmROCm: Use Codeversion 1.1 for newBinaryFormat.
Fixed stupid bugs in AsmROCmFormat testsuite (duplicate codemajor version).

Location:
CLRadeonExtender/trunk
Files:
3 edited

Legend:

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

    r3803 r3808  
    24382438            config.amdCodeVersionMajor = 1;
    24392439        if (config.amdCodeVersionMinor == BINGEN_DEFAULT)
    2440             config.amdCodeVersionMinor = 0;
     2440            config.amdCodeVersionMinor = (output.newBinFormat) ? 1 : 0;
    24412441        if (config.amdMachineKind == BINGEN16_DEFAULT)
    24422442            config.amdMachineKind = 1;
  • CLRadeonExtender/trunk/tests/amdasm/AsmBasicsCases2.cpp

    r3790 r3808  
    22212221            { ".text", ASMKERN_GLOBAL, AsmSectionType::CODE,
    22222222                {
    2223                     0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     2223                    0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
    22242224                    0x01, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
    22252225                    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  • CLRadeonExtender/trunk/tests/amdasm/AsmROCmFormat.cpp

    r3804 r3808  
    9292        os << "    Config:\n"
    9393            "      amdCodeVersion=" << ULEV(config.amdCodeVersionMajor) << "." <<
    94                 ULEV(config.amdCodeVersionMajor) << "\n"
     94                ULEV(config.amdCodeVersionMinor) << "\n"
    9595            "      amdMachine=" << ULEV(config.amdMachineKind) << ":" <<
    9696                ULEV(config.amdMachineMajor) << ":" <<
     
    264264static const AsmTestCase asmTestCases1Tbl[] =
    265265{
    266     {
     266    {   // 0
    267267        R"ffDXD(        .rocm
    268268        .gpu Fiji
     
    329329  ROCmSymbol: name=kxx1, offset=0, size=0, type=fkernel
    330330    Config:
    331       amdCodeVersion=1.1
     331      amdCodeVersion=1.0
    332332      amdMachine=1:8:0:3
    333333      kernelCodeEntryOffset=256
     
    365365  ROCmSymbol: name=kxx2, offset=512, size=0, type=kernel
    366366    Config:
    367       amdCodeVersion=1.1
     367      amdCodeVersion=1.0
    368368      amdMachine=1:8:0:3
    369369      kernelCodeEntryOffset=256
     
    432432        true
    433433    },
    434     {
     434    {   // 1
    435435        R"ffDXD(        .rocm
    436436        .gpu Fiji
     
    481481  ROCmSymbol: name=someKernelX, offset=0, size=0, type=kernel
    482482    Config:
    483       amdCodeVersion=1.1
     483      amdCodeVersion=1.0
    484484      amdMachine=8:0:1:2
    485485      kernelCodeEntryOffset=256
     
    532532        true
    533533    },
    534     {
     534    {   // 2
    535535        R"ffDXD(        .rocm
    536536        .gpu Fiji
     
    545545        "Code for kernel 'someKernelX' is too small for configuration\n", false
    546546    },
    547     {
     547    {   // 3
    548548        R"ffDXD(        .rocm
    549549        .gpu Fiji
     
    591591)ffDXD", false
    592592    },
    593     {   // different eflags
     593    {   // 4 - different eflags
    594594        R"ffDXD(.rocm
    595595        .gpu Fiji
     
    628628  ROCmSymbol: name=kxx1, offset=0, size=0, type=kernel
    629629    Config:
    630       amdCodeVersion=1.1
     630      amdCodeVersion=1.0
    631631      amdMachine=1:8:0:3
    632632      kernelCodeEntryOffset=256
     
    677677)ffDXD", "", true
    678678    },
    679     {   // metadata and others
     679    {   // 5 - metadata and others
    680680        R"ffDXD(.rocm
    681681        .gpu Fiji
     
    720720  ROCmSymbol: name=kxx1, offset=0, size=0, type=kernel
    721721    Config:
    722       amdCodeVersion=1.1
     722      amdCodeVersion=1.0
    723723      amdMachine=1:8:0:3
    724724      kernelCodeEntryOffset=256
     
    776776)ffDXD", "", true
    777777    },
    778     {   // metadata info
     778    {   // 6 - metadata info
    779779        R"ffDXD(.rocm
    780780        .gpu Fiji
     
    860860  ROCmSymbol: name=kxx1, offset=0, size=0, type=kernel
    861861    Config:
    862       amdCodeVersion=1.1
     862      amdCodeVersion=1.0
    863863      amdMachine=1:8:0:3
    864864      kernelCodeEntryOffset=256
     
    11021102        "", true
    11031103    },
    1104     {   // next metadata info example
     1104    {   //  6 - next metadata info example
    11051105        R"ffDXD(.rocm
    11061106        .gpu Fiji
     
    11511151  ROCmSymbol: name=kxx1, offset=0, size=0, type=kernel
    11521152    Config:
    1153       amdCodeVersion=1.1
     1153      amdCodeVersion=1.0
    11541154      amdMachine=1:8:0:3
    11551155      kernelCodeEntryOffset=256
     
    14391439  nullptr
    14401440  Code:
    1441   0100000000000000010008000000000000010000000000000000000000000000
     1441  0100000001000000010008000000000000010000000000000000000000000000
    14421442  0000000000000000000000000000000040000c00900000000b000a0000000000
    14431443  00000000000000004000000000000000000000000b0001000000000000000000
Note: See TracChangeset for help on using the changeset viewer.