aboutsummaryrefslogtreecommitdiff
path: root/tests/test-x86-cpuid.c
diff options
context:
space:
mode:
authorLike Xu <like.xu@linux.intel.com>2019-06-12 16:40:59 +0800
committerEduardo Habkost <ehabkost@redhat.com>2019-07-05 17:08:03 -0300
commitd65af288a84d8bf8c27e55d45545f52f016c08a7 (patch)
tree880d57673c8c8c41c01ea31f267e6cd9e90f8f80 /tests/test-x86-cpuid.c
parent176d2cda0dee9f4f78f604ad72d6a111e8e38f3b (diff)
i386: Update new x86_apicid parsing rules with die_offset support
In new sockets/dies/cores/threads model, the apicid of logical cpu could imply die level info of guest cpu topology thus x86_apicid_from_cpu_idx() need to be refactored with #dies value, so does apicid_*_offset(). To keep semantic compatibility, the legacy pkg_offset which helps to generate CPUIDs such as 0x3 for L3 cache should be mapping to die_offset. Signed-off-by: Like Xu <like.xu@linux.intel.com> Message-Id: <20190612084104.34984-5-like.xu@linux.intel.com> [ehabkost: squash unit test patch] Message-Id: <20190612084104.34984-6-like.xu@linux.intel.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'tests/test-x86-cpuid.c')
-rw-r--r--tests/test-x86-cpuid.c84
1 files changed, 45 insertions, 39 deletions
diff --git a/tests/test-x86-cpuid.c b/tests/test-x86-cpuid.c
index ff225006e4..1942287f33 100644
--- a/tests/test-x86-cpuid.c
+++ b/tests/test-x86-cpuid.c
@@ -28,74 +28,80 @@
static void test_topo_bits(void)
{
- /* simple tests for 1 thread per core, 1 core per socket */
- g_assert_cmpuint(apicid_smt_width(1, 1), ==, 0);
- g_assert_cmpuint(apicid_core_width(1, 1), ==, 0);
+ /* simple tests for 1 thread per core, 1 core per die, 1 die per package */
+ g_assert_cmpuint(apicid_smt_width(1, 1, 1), ==, 0);
+ g_assert_cmpuint(apicid_core_width(1, 1, 1), ==, 0);
+ g_assert_cmpuint(apicid_die_width(1, 1, 1), ==, 0);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 0), ==, 0);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1), ==, 1);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 2), ==, 2);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 3), ==, 3);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1, 0), ==, 0);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1, 1), ==, 1);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1, 2), ==, 2);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 1, 1, 3), ==, 3);
/* Test field width calculation for multiple values
*/
- g_assert_cmpuint(apicid_smt_width(1, 2), ==, 1);
- g_assert_cmpuint(apicid_smt_width(1, 3), ==, 2);
- g_assert_cmpuint(apicid_smt_width(1, 4), ==, 2);
+ g_assert_cmpuint(apicid_smt_width(1, 1, 2), ==, 1);
+ g_assert_cmpuint(apicid_smt_width(1, 1, 3), ==, 2);
+ g_assert_cmpuint(apicid_smt_width(1, 1, 4), ==, 2);
- g_assert_cmpuint(apicid_smt_width(1, 14), ==, 4);
- g_assert_cmpuint(apicid_smt_width(1, 15), ==, 4);
- g_assert_cmpuint(apicid_smt_width(1, 16), ==, 4);
- g_assert_cmpuint(apicid_smt_width(1, 17), ==, 5);
+ g_assert_cmpuint(apicid_smt_width(1, 1, 14), ==, 4);
+ g_assert_cmpuint(apicid_smt_width(1, 1, 15), ==, 4);
+ g_assert_cmpuint(apicid_smt_width(1, 1, 16), ==, 4);
+ g_assert_cmpuint(apicid_smt_width(1, 1, 17), ==, 5);
- g_assert_cmpuint(apicid_core_width(30, 2), ==, 5);
- g_assert_cmpuint(apicid_core_width(31, 2), ==, 5);
- g_assert_cmpuint(apicid_core_width(32, 2), ==, 5);
- g_assert_cmpuint(apicid_core_width(33, 2), ==, 6);
+ g_assert_cmpuint(apicid_core_width(1, 30, 2), ==, 5);
+ g_assert_cmpuint(apicid_core_width(1, 31, 2), ==, 5);
+ g_assert_cmpuint(apicid_core_width(1, 32, 2), ==, 5);
+ g_assert_cmpuint(apicid_core_width(1, 33, 2), ==, 6);
+ g_assert_cmpuint(apicid_die_width(1, 30, 2), ==, 0);
+ g_assert_cmpuint(apicid_die_width(2, 30, 2), ==, 1);
+ g_assert_cmpuint(apicid_die_width(3, 30, 2), ==, 2);
+ g_assert_cmpuint(apicid_die_width(4, 30, 2), ==, 2);
/* build a weird topology and see if IDs are calculated correctly
*/
/* This will use 2 bits for thread ID and 3 bits for core ID
*/
- g_assert_cmpuint(apicid_smt_width(6, 3), ==, 2);
- g_assert_cmpuint(apicid_core_width(6, 3), ==, 3);
- g_assert_cmpuint(apicid_pkg_offset(6, 3), ==, 5);
+ g_assert_cmpuint(apicid_smt_width(1, 6, 3), ==, 2);
+ g_assert_cmpuint(apicid_core_offset(1, 6, 3), ==, 2);
+ g_assert_cmpuint(apicid_die_offset(1, 6, 3), ==, 5);
+ g_assert_cmpuint(apicid_pkg_offset(1, 6, 3), ==, 5);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 0), ==, 0);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 1), ==, 1);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 2), ==, 2);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 0), ==, 0);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 1), ==, 1);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 2), ==, 2);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 1 * 3 + 0), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 1 * 3 + 0), ==,
(1 << 2) | 0);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 1 * 3 + 1), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 1 * 3 + 1), ==,
(1 << 2) | 1);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 1 * 3 + 2), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 1 * 3 + 2), ==,
(1 << 2) | 2);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 2 * 3 + 0), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 2 * 3 + 0), ==,
(2 << 2) | 0);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 2 * 3 + 1), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 2 * 3 + 1), ==,
(2 << 2) | 1);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 2 * 3 + 2), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 2 * 3 + 2), ==,
(2 << 2) | 2);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 5 * 3 + 0), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 5 * 3 + 0), ==,
(5 << 2) | 0);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 5 * 3 + 1), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 5 * 3 + 1), ==,
(5 << 2) | 1);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 5 * 3 + 2), ==,
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3, 5 * 3 + 2), ==,
(5 << 2) | 2);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 1 * 6 * 3 + 0 * 3 + 0), ==,
- (1 << 5));
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 1 * 6 * 3 + 1 * 3 + 1), ==,
- (1 << 5) | (1 << 2) | 1);
- g_assert_cmpuint(x86_apicid_from_cpu_idx(6, 3, 3 * 6 * 3 + 5 * 3 + 2), ==,
- (3 << 5) | (5 << 2) | 2);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3,
+ 1 * 6 * 3 + 0 * 3 + 0), ==, (1 << 5));
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3,
+ 1 * 6 * 3 + 1 * 3 + 1), ==, (1 << 5) | (1 << 2) | 1);
+ g_assert_cmpuint(x86_apicid_from_cpu_idx(1, 6, 3,
+ 3 * 6 * 3 + 5 * 3 + 2), ==, (3 << 5) | (5 << 2) | 2);
}
int main(int argc, char **argv)