From b7293aedaea197acf1e5f93a0b450e6989c498d8 Mon Sep 17 00:00:00 2001
From: Kevin Petit <kevin.petit@arm.com>
Date: Mon, 5 Dec 2022 12:07:40 +0000
Subject: SELECT: Replace use of cmp_t with bool_t

cmp_t is only used in the definition of SELECT and always defined to bool_t.

This removes a special case in generators.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
Change-Id: I9e7992bbfdf5c7fafdd55df90feb4dcbcdee2972
---
 chapters/ewise_ternary.adoc |  2 +-
 tosa.xml                    | 17 ++++++++---------
 tosa.xsd                    |  2 --
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/chapters/ewise_ternary.adoc b/chapters/ewise_ternary.adoc
index eb30a01..0b8097d 100644
--- a/chapters/ewise_ternary.adoc
+++ b/chapters/ewise_ternary.adoc
@@ -21,7 +21,7 @@ for_each(index in shape) {
     dim_t index1 = apply_broadcast(shape, shape1, index);
     dim_t index2 = apply_broadcast(shape, shape2, index);
     dim_t index3 = apply_broadcast(shape, shape3, index);
-    cmp_t value1 = tensor_read<cmp_t>(input1, shape1, index1);
+    bool_t value1 = tensor_read<bool_t>(input1, shape1, index1);
     in_out_t value2 = tensor_read<in_out_t>(input2, shape2, index2);
     in_out_t value3 = tensor_read<in_out_t>(input3, shape3, index3);
     in_out_t result;
diff --git a/tosa.xml b/tosa.xml
index f3f77a7..627bd5a 100644
--- a/tosa.xml
+++ b/tosa.xml
@@ -1342,7 +1342,7 @@
       <operator>
         <name>SELECT</name>
         <arguments>
-          <argument category="input" name="input1" type="cmp_t" shape="shape1">
+          <argument category="input" name="input1" type="bool_t" shape="shape1">
             <description>Input selector tensor</description>
           </argument>
           <argument category="input" name="input2" type="in_out_t*" shape="shape2">
@@ -1357,22 +1357,21 @@
           </argument>
         </arguments>
         <types>
-          <type name='cmp_t'/>
           <type name='in_out_t'/>
         </types>
-        <typesupport mode="Boolean" cmp_t="bool_t" in_out_t="bool_t"/>
-        <typesupport mode="signed 8" cmp_t="bool_t" in_out_t="int8_t"/>
-        <typesupport mode="signed 16" cmp_t="bool_t" in_out_t="int16_t"/>
-        <typesupport mode="signed 32" cmp_t="bool_t" in_out_t="int32_t"/>
-        <typesupport mode="fp16" cmp_t="bool_t" in_out_t="fp16_t">
+        <typesupport mode="Boolean" in_out_t="bool_t"/>
+        <typesupport mode="signed 8" in_out_t="int8_t"/>
+        <typesupport mode="signed 16" in_out_t="int16_t"/>
+        <typesupport mode="signed 32" in_out_t="int32_t"/>
+        <typesupport mode="fp16" in_out_t="fp16_t">
           <profile name="MI"/>
           <profile name="MT"/>
         </typesupport>
-        <typesupport mode="bf16" cmp_t="bool_t" in_out_t="bf16_t">
+        <typesupport mode="bf16" in_out_t="bf16_t">
           <profile name="MI"/>
           <profile name="MT"/>
         </typesupport>
-        <typesupport mode="fp32" cmp_t="bool_t" in_out_t="fp32_t">
+        <typesupport mode="fp32" in_out_t="fp32_t">
           <profile name="MI"/>
           <profile name="MT"/>
         </typesupport>
diff --git a/tosa.xsd b/tosa.xsd
index 1409c28..87ee3b5 100644
--- a/tosa.xsd
+++ b/tosa.xsd
@@ -50,7 +50,6 @@
     <xs:enumeration value="in_out_t"/>
     <xs:enumeration value="acc_t"/>
     <xs:enumeration value="weight_t"/>
-    <xs:enumeration value="cmp_t"/>
     <xs:enumeration value="resize_t"/>
     <xs:enumeration value="index_t"/>
     <xs:enumeration value="value_t"/>
@@ -175,7 +174,6 @@
     <xs:attribute name="in_out_t" type="datatype"/>
     <xs:attribute name="weight_t" type="datatype"/>
     <xs:attribute name="acc_t" type="datatype"/>
-    <xs:attribute name="cmp_t" type="datatype"/>
     <xs:attribute name="resize_t" type="datatype"/>
     <xs:attribute name="index_t" type="datatype"/>
     <xs:attribute name="value_t" type="datatype"/>
-- 
cgit v1.2.1