Upstream cpuinfo updates in XNNPACK as of XNNPACK:c58bd3486d52db9c6b9934912790db741bc366f6.

5 files changed, 87 insertions, 19 deletions

diff --git a/test/arm-cache.cc b/test/arm-cache.cc
index 8373f7c..7d2e4a4 100644
--- a/test/arm-cache.cc
+++ b/test/arm-cache.cc
@@ -766,7 +766,7 @@ TEST(QUALCOMM, snapdragon_845) {
 	struct cpuinfo_cache little_l2 = { 0 };
 	struct cpuinfo_cache little_l3 = { 0 };
 	cpuinfo_arm_decode_cache(
-		cpuinfo_uarch_cortex_a55, 4, UINT32_C(0x518F803C),
+		cpuinfo_uarch_cortex_a55r0, 4, UINT32_C(0x518F803C),
 		&chipset, 1, 8,
 		&little_l1i, &little_l1d, &little_l2, &little_l3);
 
@@ -910,7 +910,7 @@ TEST(SAMSUNG, exynos_9810) {
 	struct cpuinfo_cache little_l2 = { 0 };
 	struct cpuinfo_cache little_l3 = { 0 };
 	cpuinfo_arm_decode_cache(
-		cpuinfo_uarch_cortex_a55, 4, UINT32_C(0x410FD051),
+		cpuinfo_uarch_cortex_a55r0, 4, UINT32_C(0x410FD051),
 		&chipset, 1, 8,
 		&little_l1i, &little_l1d, &little_l2, &little_l3);
 
diff --git a/test/get-current.cc b/test/get-current.cc
index 4a80cab..f410b12 100644
--- a/test/get-current.cc
+++ b/test/get-current.cc
@@ -3,34 +3,36 @@
 #include <cpuinfo.h>
 
 
-TEST(CURRENT_PROCESSOR, not_null) {
-	ASSERT_TRUE(cpuinfo_initialize());
-
-	ASSERT_TRUE(cpuinfo_get_current_processor());
-}
-
 TEST(CURRENT_PROCESSOR, within_bounds) {
 	ASSERT_TRUE(cpuinfo_initialize());
 
 	const struct cpuinfo_processor* current_processor = cpuinfo_get_current_processor();
+	if (current_processor == nullptr) {
+		GTEST_SKIP();
+	}
+
 	const struct cpuinfo_processor* processors_begin = cpuinfo_get_processors();
 	const struct cpuinfo_processor* processors_end = processors_begin + cpuinfo_get_processors_count();
 	ASSERT_GE(current_processor, processors_begin);
 	ASSERT_LT(current_processor, processors_end);
 }
 
-TEST(CURRENT_CORE, not_null) {
-	ASSERT_TRUE(cpuinfo_initialize());
-
-	ASSERT_TRUE(cpuinfo_get_current_core());
-}
-
 TEST(CURRENT_CORE, within_bounds) {
 	ASSERT_TRUE(cpuinfo_initialize());
 
 	const struct cpuinfo_core* current_core = cpuinfo_get_current_core();
+	if (current_core == nullptr) {
+		GTEST_SKIP();
+	}
+
 	const struct cpuinfo_core* cores_begin = cpuinfo_get_cores();
 	const struct cpuinfo_core* cores_end = cores_begin + cpuinfo_get_cores_count();
 	ASSERT_GE(current_core, cores_begin);
 	ASSERT_LT(current_core, cores_end);
 }
+
+TEST(CURRENT_UARCH_INDEX, within_bounds) {
+	ASSERT_TRUE(cpuinfo_initialize());
+
+	ASSERT_LT(cpuinfo_get_current_uarch_index(), cpuinfo_get_uarchs_count());
+}
diff --git a/test/init.cc b/test/init.cc
index 941cb97..718eb96 100644
--- a/test/init.cc
+++ b/test/init.cc
@@ -678,6 +678,72 @@ TEST(PACKAGE, consistent_cluster) {
 	cpuinfo_deinitialize();
 }
 
+TEST(UARCHS_COUNT, within_bounds) {
+	ASSERT_TRUE(cpuinfo_initialize());
+	EXPECT_NE(0, cpuinfo_get_uarchs_count());
+	EXPECT_LE(cpuinfo_get_packages_count(), cpuinfo_get_cores_count());
+	EXPECT_LE(cpuinfo_get_packages_count(), cpuinfo_get_processors_count());
+	cpuinfo_deinitialize();
+}
+
+TEST(UARCHS, non_null) {
+	ASSERT_TRUE(cpuinfo_initialize());
+	EXPECT_TRUE(cpuinfo_get_uarchs());
+	cpuinfo_deinitialize();
+}
+
+TEST(UARCH, non_null) {
+	ASSERT_TRUE(cpuinfo_initialize());
+	for (uint32_t i = 0; i < cpuinfo_get_uarchs_count(); i++) {
+		EXPECT_TRUE(cpuinfo_get_uarch(i));
+	}
+	cpuinfo_deinitialize();
+}
+
+TEST(UARCH, non_zero_processors) {
+	ASSERT_TRUE(cpuinfo_initialize());
+	for (uint32_t i = 0; i < cpuinfo_get_uarchs_count(); i++) {
+		const cpuinfo_uarch_info* uarch = cpuinfo_get_uarch(i);
+		ASSERT_TRUE(uarch);
+
+		EXPECT_NE(0, uarch->processor_count);
+	}
+	cpuinfo_deinitialize();
+}
+
+TEST(UARCH, valid_processors) {
+	ASSERT_TRUE(cpuinfo_initialize());
+	for (uint32_t i = 0; i < cpuinfo_get_uarchs_count(); i++) {
+		const cpuinfo_uarch_info* uarch = cpuinfo_get_uarch(i);
+		ASSERT_TRUE(uarch);
+
+		EXPECT_LE(uarch->processor_count, cpuinfo_get_processors_count());
+	}
+	cpuinfo_deinitialize();
+}
+
+TEST(UARCH, non_zero_cores) {
+	ASSERT_TRUE(cpuinfo_initialize());
+	for (uint32_t i = 0; i < cpuinfo_get_uarchs_count(); i++) {
+		const cpuinfo_uarch_info* uarch = cpuinfo_get_uarch(i);
+		ASSERT_TRUE(uarch);
+
+		EXPECT_NE(0, uarch->core_count);
+	}
+	cpuinfo_deinitialize();
+}
+
+TEST(UARCH, valid_cores) {
+	ASSERT_TRUE(cpuinfo_initialize());
+	for (uint32_t i = 0; i < cpuinfo_get_uarchs_count(); i++) {
+		const cpuinfo_uarch_info* uarch = cpuinfo_get_uarch(i);
+		ASSERT_TRUE(uarch);
+
+		EXPECT_LE(uarch->core_count, cpuinfo_get_cores_count());
+	}
+	cpuinfo_deinitialize();
+}
+
 TEST(L1I_CACHES_COUNT, within_bounds) {
 	ASSERT_TRUE(cpuinfo_initialize());
 	EXPECT_NE(0, cpuinfo_get_l1i_caches_count());
diff --git a/test/mock/galaxy-s9-global.cc b/test/mock/galaxy-s9-global.cc
index 7a67129..6c72513 100644
--- a/test/mock/galaxy-s9-global.cc
+++ b/test/mock/galaxy-s9-global.cc
@@ -207,7 +207,7 @@ TEST(CORES, uarch) {
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(cpuinfo_uarch_cortex_a55, cpuinfo_get_core(i)->uarch);
+				ASSERT_EQ(cpuinfo_uarch_cortex_a55r0, cpuinfo_get_core(i)->uarch);
 				break;
 		}
 	}
@@ -329,7 +329,7 @@ TEST(CLUSTERS, uarch) {
 				ASSERT_EQ(cpuinfo_uarch_exynos_m3, cpuinfo_get_cluster(i)->uarch);
 				break;
 			case 1:
-				ASSERT_EQ(cpuinfo_uarch_cortex_a55, cpuinfo_get_cluster(i)->uarch);
+				ASSERT_EQ(cpuinfo_uarch_cortex_a55r0, cpuinfo_get_cluster(i)->uarch);
 				break;
 		}
 	}
diff --git a/test/mock/galaxy-s9-us.cc b/test/mock/galaxy-s9-us.cc
index 6df7f3c..ceea969 100644
--- a/test/mock/galaxy-s9-us.cc
+++ b/test/mock/galaxy-s9-us.cc
@@ -168,7 +168,7 @@ TEST(CORES, uarch) {
 			case 5:
 			case 6:
 			case 7:
-				ASSERT_EQ(cpuinfo_uarch_cortex_a55, cpuinfo_get_core(i)->uarch);
+				ASSERT_EQ(cpuinfo_uarch_cortex_a55r0, cpuinfo_get_core(i)->uarch);
 				break;
 		}
 	}
@@ -283,7 +283,7 @@ TEST(CLUSTERS, uarch) {
 				ASSERT_EQ(cpuinfo_uarch_cortex_a75, cpuinfo_get_cluster(i)->uarch);
 				break;
 			case 1:
-				ASSERT_EQ(cpuinfo_uarch_cortex_a55, cpuinfo_get_cluster(i)->uarch);
+				ASSERT_EQ(cpuinfo_uarch_cortex_a55r0, cpuinfo_get_cluster(i)->uarch);
 				break;
 		}
 	}
@@ -817,4 +817,4 @@ int main(int argc, char* argv[]) {
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
-}
\ No newline at end of file
+}