Skip to content

Commit 8fd1e8c

Browse files
ArturHarasimiukCompute-Runtime-Automation
ArturHarasimiuk
authored and
Compute-Runtime-Automation
committed
change config storage from string to uint
Change-Id: If206fe823541fb2a64f0a555934788eef5a05da7 Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
1 parent 4b9dc77 commit 8fd1e8c

38 files changed

+297
-246
lines changed

‎core/gen11/hw_cmds_ehl.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ namespace NEO {
1313
struct EHL : public ICLFamily {
1414
static const PLATFORM platform;
1515
static const HardwareInfo hwInfo;
16-
static const std::string defaultHardwareInfoConfig;
16+
static const uint64_t defaultHardwareInfoConfig;
1717
static FeatureTable featureTable;
1818
static WorkaroundTable workaroundTable;
1919
static const uint32_t threadsPerEu = 7;
2020
static const uint32_t maxEuPerSubslice = 8;
2121
static const uint32_t maxSlicesSupported = 1;
2222
static const uint32_t maxSubslicesSupported = 4;
2323
static const RuntimeCapabilityTable capabilityTable;
24-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
24+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2525
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2626
};
2727

‎core/gen11/hw_cmds_icllp.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ namespace NEO {
1313
struct ICLLP : public ICLFamily {
1414
static const PLATFORM platform;
1515
static const HardwareInfo hwInfo;
16-
static const std::string defaultHardwareInfoConfig;
16+
static const uint64_t defaultHardwareInfoConfig;
1717
static FeatureTable featureTable;
1818
static WorkaroundTable workaroundTable;
1919
static const uint32_t threadsPerEu = 7;
2020
static const uint32_t maxEuPerSubslice = 8;
2121
static const uint32_t maxSlicesSupported = 1;
2222
static const uint32_t maxSubslicesSupported = 8;
2323
static const RuntimeCapabilityTable capabilityTable;
24-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
24+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2525
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2626
};
2727

‎core/gen11/hw_cmds_lkf.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2019 Intel Corporation
2+
* Copyright (C) 2018-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -13,15 +13,15 @@ namespace NEO {
1313
struct LKF : public ICLFamily {
1414
static const PLATFORM platform;
1515
static const HardwareInfo hwInfo;
16-
static const std::string defaultHardwareInfoConfig;
16+
static const uint64_t defaultHardwareInfoConfig;
1717
static FeatureTable featureTable;
1818
static WorkaroundTable workaroundTable;
1919
static const uint32_t threadsPerEu = 7;
2020
static const uint32_t maxEuPerSubslice = 8;
2121
static const uint32_t maxSlicesSupported = 1;
2222
static const uint32_t maxSubslicesSupported = 8;
2323
static const RuntimeCapabilityTable capabilityTable;
24-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
24+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2525
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2626
};
2727
class LKF_1x8x8 : public LKF {

‎core/gen12lp/hw_cmds_tgllp.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019 Intel Corporation
2+
* Copyright (C) 2019-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -12,7 +12,7 @@ namespace NEO {
1212
struct TGLLP : public TGLLPFamily {
1313
static const PLATFORM platform;
1414
static const HardwareInfo hwInfo;
15-
static const std::string defaultHardwareInfoConfig;
15+
static const uint64_t defaultHardwareInfoConfig;
1616
static FeatureTable featureTable;
1717
static WorkaroundTable workaroundTable;
1818
static const uint32_t threadsPerEu = 7;
@@ -21,7 +21,7 @@ struct TGLLP : public TGLLPFamily {
2121
static const uint32_t maxSubslicesSupported = 6;
2222
static const uint32_t maxDualSubslicesSupported = 12;
2323
static const RuntimeCapabilityTable capabilityTable;
24-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
24+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2525
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2626
};
2727

‎core/gen8/hw_cmds_bdw.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2019 Intel Corporation
2+
* Copyright (C) 2018-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -15,15 +15,15 @@ namespace NEO {
1515
struct BDW : public BDWFamily {
1616
static const PLATFORM platform;
1717
static const HardwareInfo hwInfo;
18-
static const std::string defaultHardwareInfoConfig;
18+
static const uint64_t defaultHardwareInfoConfig;
1919
static FeatureTable featureTable;
2020
static WorkaroundTable workaroundTable;
2121
static const uint32_t threadsPerEu = 7;
2222
static const uint32_t maxEuPerSubslice = 8;
2323
static const uint32_t maxSlicesSupported = 2;
2424
static const uint32_t maxSubslicesSupported = 6;
2525
static const RuntimeCapabilityTable capabilityTable;
26-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
26+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2727
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2828
};
2929
class BDW_1x2x6 : public BDW {

‎core/gen9/hw_cmds_bxt.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017-2019 Intel Corporation
2+
* Copyright (C) 2017-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -13,7 +13,7 @@ namespace NEO {
1313
struct BXT : public SKLFamily {
1414
static const PLATFORM platform;
1515
static const HardwareInfo hwInfo;
16-
static const std::string defaultHardwareInfoConfig;
16+
static const uint64_t defaultHardwareInfoConfig;
1717
static FeatureTable featureTable;
1818
static WorkaroundTable workaroundTable;
1919
static const uint32_t threadsPerEu = 6;
@@ -22,7 +22,7 @@ struct BXT : public SKLFamily {
2222
static const uint32_t maxSubslicesSupported = 3;
2323

2424
static const RuntimeCapabilityTable capabilityTable;
25-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
25+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2626
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2727
};
2828

‎core/gen9/hw_cmds_cfl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2019 Intel Corporation
2+
* Copyright (C) 2018-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -13,7 +13,7 @@ namespace NEO {
1313
struct CFL : public SKLFamily {
1414
static const PLATFORM platform;
1515
static const HardwareInfo hwInfo;
16-
static const std::string defaultHardwareInfoConfig;
16+
static const uint64_t defaultHardwareInfoConfig;
1717
static FeatureTable featureTable;
1818
static WorkaroundTable workaroundTable;
1919
static const uint32_t threadsPerEu = 7;
@@ -22,7 +22,7 @@ struct CFL : public SKLFamily {
2222
static const uint32_t maxSubslicesSupported = 9;
2323

2424
static const RuntimeCapabilityTable capabilityTable;
25-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
25+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2626
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2727
};
2828

‎core/gen9/hw_cmds_glk.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017-2019 Intel Corporation
2+
* Copyright (C) 2017-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -13,7 +13,7 @@ namespace NEO {
1313
struct GLK : public SKLFamily {
1414
static const PLATFORM platform;
1515
static const HardwareInfo hwInfo;
16-
static const std::string defaultHardwareInfoConfig;
16+
static const uint64_t defaultHardwareInfoConfig;
1717
static FeatureTable featureTable;
1818
static WorkaroundTable workaroundTable;
1919
static const uint32_t threadsPerEu = 6;
@@ -22,7 +22,7 @@ struct GLK : public SKLFamily {
2222
static const uint32_t maxSubslicesSupported = 3;
2323

2424
static const RuntimeCapabilityTable capabilityTable;
25-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
25+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2626
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2727
};
2828

‎core/gen9/hw_cmds_kbl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017-2019 Intel Corporation
2+
* Copyright (C) 2017-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -13,7 +13,7 @@ namespace NEO {
1313
struct KBL : public SKLFamily {
1414
static const PLATFORM platform;
1515
static const HardwareInfo hwInfo;
16-
static const std::string defaultHardwareInfoConfig;
16+
static const uint64_t defaultHardwareInfoConfig;
1717
static FeatureTable featureTable;
1818
static WorkaroundTable workaroundTable;
1919
static const uint32_t threadsPerEu = 7;
@@ -22,7 +22,7 @@ struct KBL : public SKLFamily {
2222
static const uint32_t maxSubslicesSupported = 9;
2323

2424
static const RuntimeCapabilityTable capabilityTable;
25-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
25+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2626
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2727
};
2828

‎core/gen9/hw_cmds_skl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017-2019 Intel Corporation
2+
* Copyright (C) 2017-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -13,7 +13,7 @@ namespace NEO {
1313
struct SKL : public SKLFamily {
1414
static const PLATFORM platform;
1515
static const HardwareInfo hwInfo;
16-
static const std::string defaultHardwareInfoConfig;
16+
static const uint64_t defaultHardwareInfoConfig;
1717
static FeatureTable featureTable;
1818
static WorkaroundTable workaroundTable;
1919
static const uint32_t threadsPerEu = 7;
@@ -22,7 +22,7 @@ struct SKL : public SKLFamily {
2222
static const uint32_t maxSubslicesSupported = 9;
2323

2424
static const RuntimeCapabilityTable capabilityTable;
25-
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const std::string &hwInfoConfig);
25+
static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig);
2626
static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
2727
};
2828

0 commit comments

Comments
 (0)