From ce015e7d72f522ac310404f29a0bc467f9f69c58 Mon Sep 17 00:00:00 2001
From: Eric Kunze <eric.kunze@arm.com>
Date: Tue, 19 Mar 2024 16:02:07 -0700
Subject: Adjustments to profile changes

Use "or" when listing an operator/data type that can be implemented in multiple profiles.
Modify variable_read/variable_write to note that both the base profile and extension
must be supported (for example BI and EXT-VARIABLE)

Signed-off-by: Eric Kunze <eric.kunze@arm.com>
Change-Id: Iae15fb1032a4e03da73eda0f3a15e4c0965de052
---
 tools/genspec.py |  2 +-
 tosa.xml         | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/tools/genspec.py b/tools/genspec.py
index 3865486..bae11cc 100755
--- a/tools/genspec.py
+++ b/tools/genspec.py
@@ -94,7 +94,7 @@ class TOSASpecAsciidocGenerator:
             file.write(header)
             file.write("\n\n")
             for tysup in sorted(op.typesupports, key=cmp_to_key(compare_profiles)):
-                profile = ", ".join(tysup.profiles) if tysup.profiles else "Any"
+                profile = " or ".join(tysup.profiles) if tysup.profiles else "Any"
                 entry = f"|{profile}|{tysup.mode}"
                 for ty in op.types:
                     entry += f"|{tysup.tymap[ty]}"
diff --git a/tosa.xml b/tosa.xml
index 675eeb6..5973ff1 100644
--- a/tosa.xml
+++ b/tosa.xml
@@ -3139,16 +3139,13 @@ used.</description>
           <type name='var_t' />
         </types>
         <typesupport mode="signed 8" var_t="i8_t" >
-          <op_profile name="BI"/>
-          <op_profile name="EXT-VARIABLE"/>
+          <op_profile name="BI" and_name="EXT-VARIABLE"/>
         </typesupport>
         <typesupport mode="fp16" var_t="fp16_t" >
-          <op_profile name="MI"/>
-          <op_profile name="EXT-VARIABLE"/>
+          <op_profile name="MI" and_name="EXT-VARIABLE"/>
         </typesupport>
         <typesupport mode="fp32" var_t="fp32_t" >
-          <op_profile name="MI"/>
-          <op_profile name="EXT-VARIABLE"/>
+          <op_profile name="MI" and_name="EXT-VARIABLE"/>
         </typesupport>
       </operator>
       <operator>
@@ -3168,16 +3165,13 @@ used.</description>
           <type name='var_t' />
         </types>
         <typesupport mode="signed 8" var_t="i8_t" >
-          <op_profile name="BI"/>
-          <op_profile name="EXT-VARIABLE"/>
+          <op_profile name="BI" and_name="EXT-VARIABLE"/>
         </typesupport>
         <typesupport mode="fp16" var_t="fp16_t" >
-          <op_profile name="MI"/>
-          <op_profile name="EXT-VARIABLE"/>
+          <op_profile name="MI" and_name="EXT-VARIABLE"/>
         </typesupport>
         <typesupport mode="fp32" var_t="fp32_t" >
-          <op_profile name="MI"/>
-          <op_profile name="EXT-VARIABLE"/>
+          <op_profile name="MI" and_name="EXT-VARIABLE"/>
         </typesupport>
       </operator>
     </operatorgroup>
-- 
cgit v1.2.1