Ocloc: Enhance platforms support for disasm option

- Extend support for existing platforms [disasm option].
- Do not use deprecated core acronyms.
Related-To: NEO-7235
Signed-off-by: Kacper Nowak <kacper.nowak@intel.com>
This commit is contained in:
Kacper Nowak
2022-08-12 00:52:33 +00:00
committed by Compute-Runtime-Automation
parent e66bbb54bc
commit d213a8e8cd
2 changed files with 39 additions and 4 deletions

View File

@ -669,6 +669,10 @@ TEST(DecoderHelperTest, GivenGfxCoreFamilyWhenTranslatingToIgaGenBaseThenExpecte
std::pair{IGFX_GEN9_CORE, IGA_GEN9},
std::pair{IGFX_GEN11_CORE, IGA_GEN11},
std::pair{IGFX_GEN11LP_CORE, IGA_GEN11},
std::pair{IGFX_GEN12LP_CORE, IGA_XE},
std::pair{IGFX_XE_HP_CORE, IGA_XE_HP},
std::pair{IGFX_XE_HPG_CORE, IGA_XE_HPG},
std::pair{IGFX_XE_HPC_CORE, IGA_XE_HPC},
std::pair{IGFX_UNKNOWN_CORE, IGA_GEN_INVALID}};
for (const auto &[input, expectedOutput] : translations) {
@ -686,6 +690,17 @@ TEST(DecoderHelperTest, GivenProductFamilyWhenTranslatingToIgaGenBaseThenExpecte
std::pair{IGFX_COFFEELAKE, IGA_GEN9p5},
std::pair{IGFX_ICELAKE, IGA_GEN11},
std::pair{IGFX_ICELAKE_LP, IGA_GEN11},
std::pair{IGFX_LAKEFIELD, IGA_GEN11},
std::pair{IGFX_ELKHARTLAKE, IGA_GEN11},
std::pair{IGFX_TIGERLAKE_LP, IGA_XE},
std::pair{IGFX_ROCKETLAKE, IGA_XE},
std::pair{IGFX_ALDERLAKE_N, IGA_XE},
std::pair{IGFX_ALDERLAKE_P, IGA_XE},
std::pair{IGFX_ALDERLAKE_S, IGA_XE},
std::pair{IGFX_DG1, IGA_XE},
std::pair{IGFX_XE_HP_SDV, IGA_XE_HP},
std::pair{IGFX_DG2, IGA_XE_HPG},
std::pair{IGFX_PVC, IGA_XE_HPC},
std::pair{IGFX_UNKNOWN, IGA_GEN_INVALID}};
for (const auto &[input, expectedOutput] : translations) {

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
* Copyright (C) 2019-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -23,13 +23,26 @@ inline iga_gen_t translateToIgaGenBase(PRODUCT_FAMILY productFamily) {
case IGFX_BROXTON:
return IGA_GEN9lp;
case IGFX_KABYLAKE:
return IGA_GEN9p5;
case IGFX_COFFEELAKE:
return IGA_GEN9p5;
case IGFX_ICELAKE:
return IGA_GEN11;
case IGFX_ICELAKE_LP:
case IGFX_LAKEFIELD:
case IGFX_ELKHARTLAKE:
return IGA_GEN11;
case IGFX_TIGERLAKE_LP:
case IGFX_ROCKETLAKE:
case IGFX_ALDERLAKE_S:
case IGFX_ALDERLAKE_P:
case IGFX_ALDERLAKE_N:
case IGFX_DG1:
return IGA_XE;
case IGFX_XE_HP_SDV:
return IGA_XE_HP;
case IGFX_DG2:
return IGA_XE_HPG;
case IGFX_PVC:
return IGA_XE_HPC;
}
}
@ -42,9 +55,16 @@ inline iga_gen_t translateToIgaGenBase(GFXCORE_FAMILY coreFamily) {
case IGFX_GEN9_CORE:
return IGA_GEN9;
case IGFX_GEN11_CORE:
return IGA_GEN11;
case IGFX_GEN11LP_CORE:
return IGA_GEN11;
case IGFX_GEN12LP_CORE:
return IGA_XE;
case IGFX_XE_HP_CORE:
return IGA_XE_HP;
case IGFX_XE_HPG_CORE:
return IGA_XE_HPG;
case IGFX_XE_HPC_CORE:
return IGA_XE_HPC;
}
}