From 4cd23cb9ec62e452a8685066456bf640c9b68d4c Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 20 Jun 2019 13:15:54 -0400 Subject: [PATCH] P4 to Git Change 1876891 by axie@axie_pal_l5 on 2019/06/20 13:11:27 SWDEV-190204 - [CQE OCL][NAVI 14] "Unsupported device(gfx1012) for the test! " for OCLPerfCounters which is subtest of oclruntime. Fix the ID converstion array. Tests: 1. run the test in Navi 10. 2. http://ocltc.amd.com:8111/viewModification.html?modId=122114&personal=true&tab=vcsModificationBuilds 3. The CQE has confirmed the idea fixed the issue in Navi14 Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcounters.cpp#22 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLPerfCounters.cpp#48 edit [ROCm/clr commit: 866533ef009999fedaad2d5036e1e7fd17e79273] --- .../rocclr/runtime/device/pal/palcounters.cpp | 182 +++++++++--------- 1 file changed, 90 insertions(+), 92 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/palcounters.cpp b/projects/clr/rocclr/runtime/device/pal/palcounters.cpp index c164ab74c2..3d323c3dd2 100644 --- a/projects/clr/rocclr/runtime/device/pal/palcounters.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palcounters.cpp @@ -505,7 +505,7 @@ static const std::array, 123> gfx9BlockIdPal = {{ {0x1F, 7}, // RMI7 - 122 }}; -static const std::array, 151> gfx10BlockIdPal = {{ +static const std::array, 139> gfx10BlockIdPal = {{ {0x0E, 0}, // CB0 - 0 {0x0E, 1}, // CB1 - 1 {0x0E, 2}, // CB2 - 2 @@ -556,97 +556,95 @@ static const std::array, 151> gfx10BlockIdPal = {{ {0x09, 7}, // TD7 - 47 {0x09, 8}, // TD8 - 48 {0x09, 9}, // TD9 - 49 - {0x09, 0x0a}, // TD10 - 60 - {0x09, 0x0b}, // TD11 - 61 - {0x09, 0x0c}, // TD12 - 62 - {0x09, 0x0d}, // TD13 - 63 - {0x09, 0x0e}, // TD14 - 64 - {0x09, 0x0f}, // TD15 - 65 - {0x0A, 0}, // TCP0 - 66 - {0x0A, 1}, // TCP1 - 67 - {0x0A, 2}, // TCP2 - 68 - {0x0A, 3}, // TCP3 - 69 - {0x0A, 4}, // TCP4 - 70 - {0x0A, 5}, // TCP5 - 71 - {0x0A, 6}, // TCP6 - 72 - {0x0A, 7}, // TCP7 - 73 - {0x0A, 8}, // TCP8 - 74 - {0x0A, 9}, // TCP9 - 75 - {0x0A, 0x0a}, // TCP10 - 76 - {0x0A, 0x0b}, // TCP11 - 77 - {0x0A, 0x0c}, // TCP12 - 78 - {0x0A, 0x0d}, // TCP13 - 79 - {0x0A, 0x0e}, // TCP14 - 80 - {0x0A, 0x0f}, // TCP15 - 81 - {0x0F, 0}, // GDS - 82 - {0x16, 0}, // CPG - 83 - {0x17, 0}, // CPC - 84 - {0x1A, 0}, // ATC - 85 - {0x1B, 0}, // ATCL2 - 86 - {0x1C, 0}, // MCVML2 - 87 - {0x1D, 0}, // EA0 - 88 - {0x1D, 1}, // EA1 - 89 - {0x1D, 2}, // EA2 - 90 - {0x1D, 3}, // EA3 - 91 - {0x1D, 4}, // EA4 - 92 - {0x1D, 5}, // EA5 - 93 - {0x1D, 6}, // EA6 - 94 - {0x1D, 7}, // EA7 - 95 - {0x1D, 8}, // EA8 - 96 - {0x1D, 9}, // EA9 - 97 - {0x1D, 0x0a}, // EA10 - 98 - {0x1D, 0x0b}, // EA11 - 99 - {0x1D, 0x0c}, // EA12 - 100 - {0x1D, 0x0d}, // EA13 - 101 - {0x1D, 0x0e}, // EA14 - 102 - {0x1D, 0x0f}, // EA15 - 103 - {0x1E, 0}, // RPB - 104 - {0x1F, 0}, // RMI0 - 105 - {0x1F, 1}, // RMI1 - 106 - {0x21, 0}, // GE - 107 - {0x22, 0}, // GL1A - 108 - {0x23, 0}, // GL1C - 109 - {0x24, 0}, // GL1CG0 - 110 - {0x24, 1}, // GL1CG1 - 111 - {0x24, 2}, // GL1CG2 - 112 - {0x24, 3}, // GL1CG3 - 113 - {0x25, 0}, // GL2A0 - 114 - {0x25, 1}, // GL2A1 - 115 - {0x25, 2}, // GL2A2 - 116 - {0x25, 3}, // GL2A3 - 117 - {0x26, 0}, // GL2C0 - 118 - {0x26, 1}, // GL2C1 - 119 - {0x26, 2}, // GL2C2 - 120 - {0x26, 3}, // GL2C3 - 121 - {0x26, 4}, // GL2C4 - 122 - {0x26, 5}, // GL2C5 - 123 - {0x26, 6}, // GL2C6 - 124 - {0x26, 7}, // GL2C7 - 125 - {0x26, 8}, // GL2C8 - 126 - {0x26, 9}, // GL2C9 - 127 - {0x26, 0x0a}, // GL2C10 - 128 - {0x26, 0x0b}, // GL2C11 - 129 - {0x26, 0x0c}, // GL2C12 - 130 - {0x26, 0x0d}, // GL2C13 - 131 - {0x26, 0x0e}, // GL2C14 - 132 - {0x26, 0x0f}, // GL2C15 - 133 - {0x26, 0x10}, // GL2C16 - 134 - {0x26, 0x11}, // GL2C17 - 135 - {0x26, 0x12}, // GL2C18 - 136 - {0x26, 0x13}, // GL2C19 - 137 - {0x26, 0x14}, // GL2C20 - 138 - {0x26, 0x15}, // GL2C21 - 139 - {0x26, 0x16}, // GL2C22 - 140 - {0x26, 0x17}, // GL2C23 - 141 - {0x27, 0}, // CHA - 142 - {0x28, 0}, // CHC0 - 143 - {0x28, 1}, // CHC1 - 144 - {0x28, 2}, // CHC2 - 145 - {0x28, 3}, // CHC3 - 146 - {0x29, 0}, // CHCG - 147 - {0x2A, 0}, // GUS - 148 - {0x2B, 0}, // GCR - 149 - {0x2C, 0}, // PH - 150 + {0x09, 0x0a}, // TD10 - 50 + {0x09, 0x0b}, // TD11 - 51 + {0x09, 0x0c}, // TD12 - 52 + {0x09, 0x0d}, // TD13 - 53 + {0x09, 0x0e}, // TD14 - 54 + {0x09, 0x0f}, // TD15 - 55 + {0x0A, 0}, // TCP0 - 56 + {0x0A, 1}, // TCP1 - 57 + {0x0A, 2}, // TCP2 - 58 + {0x0A, 3}, // TCP3 - 59 + {0x0A, 4}, // TCP4 - 60 + {0x0A, 5}, // TCP5 - 61 + {0x0A, 6}, // TCP6 - 62 + {0x0A, 7}, // TCP7 - 63 + {0x0A, 8}, // TCP8 - 64 + {0x0A, 9}, // TCP9 - 65 + {0x0A, 0x0a}, // TCP10 - 66 + {0x0A, 0x0b}, // TCP11 - 67 + {0x0A, 0x0c}, // TCP12 - 68 + {0x0A, 0x0d}, // TCP13 - 69 + {0x0A, 0x0e}, // TCP14 - 70 + {0x0A, 0x0f}, // TCP15 - 71 + {0x0F, 0}, // GDS - 72 + {0x16, 0}, // CPG - 73 + {0x17, 0}, // CPC - 74 + {0x1A, 0}, // ATC - 75 + {0x1B, 0}, // ATCL2 - 76 + {0x1C, 0}, // MCVML2 - 77 + {0x1D, 0}, // EA0 - 78 + {0x1D, 1}, // EA1 - 79 + {0x1D, 2}, // EA2 - 80 + {0x1D, 3}, // EA3 - 81 + {0x1D, 4}, // EA4 - 82 + {0x1D, 5}, // EA5 - 83 + {0x1D, 6}, // EA6 - 84 + {0x1D, 7}, // EA7 - 85 + {0x1D, 8}, // EA8 - 86 + {0x1D, 9}, // EA9 - 87 + {0x1D, 0x0a}, // EA10 - 88 + {0x1D, 0x0b}, // EA11 - 89 + {0x1D, 0x0c}, // EA12 - 90 + {0x1D, 0x0d}, // EA13 - 91 + {0x1D, 0x0e}, // EA14 - 92 + {0x1D, 0x0f}, // EA15 - 93 + {0x1E, 0}, // RPB - 94 + {0x1F, 0}, // RMI0 - 95 + {0x1F, 1}, // RMI1 - 96 + {0x21, 0}, // GE - 97 + {0x22, 0}, // GL1A - 98 + {0x23, 0}, // GL1C - 99 + {0x24, 0}, // GL1CG0 - 100 + {0x24, 1}, // GL1CG1 - 101 + {0x24, 2}, // GL1CG2 - 102 + {0x24, 3}, // GL1CG3 - 103 + {0x25, 0}, // GL2A0 - 104 + {0x25, 1}, // GL2A1 - 105 + {0x25, 2}, // GL2A2 - 106 + {0x25, 3}, // GL2A3 - 107 + {0x26, 0}, // GL2C0 - 108 + {0x26, 1}, // GL2C1 - 109 + {0x26, 2}, // GL2C2 - 110 + {0x26, 3}, // GL2C3 - 111 + {0x26, 4}, // GL2C4 - 112 + {0x26, 5}, // GL2C5 - 113 + {0x26, 6}, // GL2C6 - 114 + {0x26, 7}, // GL2C7 - 115 + {0x26, 8}, // GL2C8 - 116 + {0x26, 9}, // GL2C9 - 117 + {0x26, 0x0a}, // GL2C10 - 118 + {0x26, 0x0b}, // GL2C11 - 119 + {0x26, 0x0c}, // GL2C12 - 120 + {0x26, 0x0d}, // GL2C13 - 121 + {0x26, 0x0e}, // GL2C14 - 122 + {0x26, 0x0f}, // GL2C15 - 123 + {0x26, 0x10}, // GL2C16 - 124 + {0x26, 0x11}, // GL2C17 - 125 + {0x26, 0x12}, // GL2C18 - 126 + {0x26, 0x13}, // GL2C19 - 127 + {0x26, 0x14}, // GL2C20 - 128 + {0x26, 0x15}, // GL2C21 - 129 + {0x26, 0x16}, // GL2C22 - 130 + {0x26, 0x17}, // GL2C23 - 131 + {0x27, 0}, // CHA - 132 + {0x28, 0}, // CHC - 133 + {0x29, 0}, // CHCG - 134 + {0x2A, 0}, // GUS - 135 + {0x2B, 0}, // GCR - 136 + {0x2C, 0}, // PH - 137 + {0x2C, 0}, // UTCL1 - 138 }}; void PerfCounter::convertInfo() {