Merge remote-tracking branch 'origin/fp16-staging' into main

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
KhronosGroup · Jun 3, 2024 · c6943ba · c6943ba
2 parents 556025b + 11e39f5
commit c6943ba
Show file tree

Hide file tree

Showing 38 changed files with 7,144 additions and 357 deletions.
diff --git a/test_common/harness/errorHelpers.cpp b/test_common/harness/errorHelpers.cpp
@@ -371,7 +371,7 @@ static float Ulp_Error_Half_Float(float test, double reference)
     return (float)scalbn(testVal - reference, ulp_exp);
 }
 
-float Ulp_Error_Half(cl_half test, float reference)
+float Ulp_Error_Half(cl_half test, double reference)
 {
     return Ulp_Error_Half_Float(cl_half_to_float(test), reference);
 }

diff --git a/test_common/harness/errorHelpers.h b/test_common/harness/errorHelpers.h
@@ -185,7 +185,7 @@ static int vlog_win32(const char *format, ...);
 
 extern const char *IGetErrorString(int clErrorCode);
 
-extern float Ulp_Error_Half(cl_half test, float reference);
+extern float Ulp_Error_Half(cl_half test, double reference);
 extern float Ulp_Error(float test, double reference);
 extern float Ulp_Error_Double(double test, long double reference);
 

diff --git a/test_common/harness/rounding_mode.h b/test_common/harness/rounding_mode.h
@@ -42,10 +42,11 @@ typedef enum
     kshort = 3,
     kuint = 4,
     kint = 5,
-    kfloat = 6,
-    kdouble = 7,
-    kulong = 8,
-    klong = 9,
+    khalf = 6,
+    kfloat = 7,
+    kdouble = 8,
+    kulong = 9,
+    klong = 10,
 
     // This goes last
     kTypeCount