ParseTopologyPropertiesString helper function

Added a helper function for parsing topology properties file for string values which will be used in the next commit to parse unique_id field and added corresponding UT similar to existing UT for TestParseTopologyProperties

Author: sriram-30

internal/pkg/amdgpu/amdgpu.go

@@ -293,6 +293,33 @@ func ParseTopologyProperties(path string, re *regexp.Regexp) (int64, error) {
 return v, e
 }
 
+// ParseTopologyProperties parse for a property value in kfd topology file as string
+// The format is usually one entry per line <name> <value>. Examples in
+// testdata/topology-parsing/.
+func ParseTopologyPropertiesString(path string, re *regexp.Regexp) (string, error) {
+ f, e := os.Open(path)
+ if e != nil {
+ return "", e
+ }
+
+ e = errors.New("Topology property not found. Regex: " + re.String())
+ v := ""
+ scanner := bufio.NewScanner(f)
+ for scanner.Scan() {
+ m := re.FindStringSubmatch(scanner.Text())
+ if m == nil {
+ continue
+ }
+
+ v = m[1]
+ e = nil
+ break
+ }
+ f.Close()
+
+ return v, e
+}
+
 var fwVersionRe = regexp.MustCompile(`(\w+) feature version: (\d+), firmware version: (0x[0-9a-fA-F]+)`)
 
 func parseDebugFSFirmwareInfo(path string) (map[string]uint32, map[string]uint32) {

internal/pkg/amdgpu/amdgpu_test.go

@@ -161,6 +161,21 @@ func TestParseTopologyProperties(t *testing.T) {
 }
 
 }
+
+func TestParseTopologyPropertiesString(t *testing.T) {
+var v string
+var re *regexp.Regexp
+var path string
+
+re = regexp.MustCompile(`unique_id\s(\d+)`)
+path = "../../../testdata/topology-parsing/topology/nodes/2/properties"
+v, _ = ParseTopologyPropertiesString(path, re)
+if v != "14073402507705256557" {
+t.Errorf("Error parsing %s for `%s`: expect %s", path, re.String(), "14073402507705256557")
+}
+
+}
+
 func TestParseDebugFSFirmwareInfo(t *testing.T) {
 expFeat := map[string]uint32{
 "VCE": 0,

testdata/topology-parsing/topology/nodes/1/properties

@@ -23,4 +23,5 @@ local_mem_size 17163091968
 fw_version 392
 capability 8832
 sdma_fw_version 421
+unique_id 14073402507705256556
 max_engine_clk_ccompute 3200

testdata/topology-parsing/topology/nodes/2/properties

@@ -23,4 +23,5 @@ local_mem_size 17163091968
 fw_version 392
 capability 8832
 sdma_fw_version 421
+unique_id 14073402507705256557
 max_engine_clk_ccompute 3200