From 9abf85c06baefca3165cfaeb4f2938473169d022 Mon Sep 17 00:00:00 2001
From: David Ogbeide <Davidboyowa.Ogbeide@amd.com>
Date: Wed, 16 Mar 2016 11:42:42 -0400
Subject: [PATCH] libhsakmt: get CPU model name from proc/cpuinfo

HSA thunk is currently only aware of GPU node
model info, CPU names are NULL.



Signed-off-by: David Ogbeide <davidboyowa.ogbeide@amd.com>
Change-Id: I3c2adbb8566a5048b44c39fff4fd8228912468ff


[ROCm/ROCR-Runtime commit: 682776d89ad9dc34490d01a0d702977c80cd8320]
---
 projects/rocr-runtime/src/topology.c | 75 ++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/projects/rocr-runtime/src/topology.c b/projects/rocr-runtime/src/topology.c
index 65713271e6..a1f53599bb 100644
--- a/projects/rocr-runtime/src/topology.c
+++ b/projects/rocr-runtime/src/topology.c
@@ -326,6 +326,68 @@ bool topology_is_dgpu(uint16_t device_id)
 	return false;
 }
 
+static HSAKMT_STATUS
+topology_get_cpu_model_name(HsaNodeProperties *props) {
+	FILE *fd;
+	char read_buf[256], cpu_model_name[128];
+	const char *p;
+	uint32_t i, apic_id;
+
+	if (!props)
+		return HSAKMT_STATUS_INVALID_PARAMETER;
+
+	fd = fopen(PROC_CPUINFO_PATH, "r");
+	if (!fd) {
+		printf("Failed to open [%s]. Unable to get CPU Model Name",
+			PROC_CPUINFO_PATH);
+		return HSAKMT_STATUS_ERROR;
+	}
+
+	while (fgets(read_buf, sizeof(read_buf), fd) != NULL) {
+		/* Get the model name first, in case matching
+		 * apic IDs are also present in the file
+		 */
+		if (!strncmp("model name", read_buf, sizeof("model name") - 1)) {
+			p = strrchr(read_buf, ':');
+			if (!p)
+				goto err;
+
+			p++; // remove separator ':'
+			for (; isspace(*p); p++); /* remove white space */
+
+			/* Extract model name from string */
+			for (i = 0; i < sizeof(cpu_model_name) - 1 && p[i] != '\n'; i++)
+				cpu_model_name[i] = p[i];
+			cpu_model_name[i] = '\0';
+		}
+
+		if (!strncmp("apicid", read_buf, sizeof("apicid") - 1)) {
+			p = strrchr(read_buf, ':');
+			if (!p)
+				goto err;
+
+			p++; // remove separator ':'
+			for (; isspace(*p); p++); /* remove white space */
+
+			/* Extract apic_id from remaining chars */
+			apic_id = atoi(p);
+
+			/* Set CPU model name only if corresponding apic id */
+			if (props->CComputeIdLo == apic_id) {
+				/* Convert from UTF8 to UTF16 */
+				for (i = 0; cpu_model_name[i] != '\0' && i < HSA_PUBLIC_NAME_SIZE - 1; i++)
+					props->MarketingName[i] = cpu_model_name[i];
+				props->MarketingName[i] = '\0';
+			}
+		}
+	}
+	fclose(fd);
+	return HSAKMT_STATUS_SUCCESS;
+err:
+	fclose(fd);
+	return HSAKMT_STATUS_ERROR;
+}
+
 static int topology_search_processor_vendor(const char *processor_name)
 {
 	unsigned int i;
@@ -495,6 +557,19 @@ topology_sysfs_get_node_props(uint32_t node_id, HsaNodeProperties *props, uint32
 		for (i = 0; hsa_gfxip->marketing_name[i] != 0 && i < HSA_PUBLIC_NAME_SIZE - 1; i++)
 			props->MarketingName[i] = hsa_gfxip->marketing_name[i];
 		props->MarketingName[i] = 0;
+	} else {
+		/* Is CPU node */
+		if (!props->NumFComputeCores || !props->DeviceId) {
+			ret = topology_get_cpu_model_name(props);
+			if (ret != HSAKMT_STATUS_SUCCESS)
+			{
+				printf("Failed to get CPU Model Name from %s\n", PROC_CPUINFO_PATH);
+				ret = HSAKMT_STATUS_SUCCESS; /* No hard error, continue regardless */
+			}
+		} else {
+			ret = HSAKMT_STATUS_ERROR;
+			goto err;
+		}
 	}
 	if (props->NumFComputeCores)
 		assert(props->EngineId.ui32.Major);