qualify the function saturate with q10n:: specifier to prevent ambiguity

quickwritereader · vpirogov · commit cfbc41371abe · 2024-05-31T12:38:12.000-07:00
diff --git a/src/cpu/s390x/gemmu16.cpp b/src/cpu/s390x/gemmu16.cpp
@@ -50,7 +50,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,
                 for (dim_t i = 0; i < m; i++) {
                     double val = alpha * (double)Ctemp[j * ldCtemp + i] + co[0];
                     gPtr(i, j) = static_cast<int32_t>(
-                            nearbyint(saturate<int32_t, double>(val)));
+                            nearbyint(q10n::saturate<int32_t, double>(val)));
                 }
             }
         } else {
@@ -59,7 +59,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,
                     double val = beta * (double)gPtr(i, j)
                             + alpha * (double)Ctemp[j * ldCtemp + i] + co[0];
                     gPtr(i, j) = static_cast<int32_t>(
-                            nearbyint(saturate<int32_t, double>(val)));
+                            nearbyint(q10n::saturate<int32_t, double>(val)));
                 }
             }
         }
@@ -69,7 +69,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,
                 for (dim_t i = 0; i < m; i++) {
                     double val = alpha * (double)Ctemp[j * ldCtemp + i] + co[i];
                     gPtr(i, j) = static_cast<int32_t>(
-                            nearbyint(saturate<int32_t, double>(val)));
+                            nearbyint(q10n::saturate<int32_t, double>(val)));
                 }
             }
         } else {
@@ -78,7 +78,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,
                     double val = beta * (double)gPtr(i, j)
                             + alpha * (double)Ctemp[j * ldCtemp + i] + co[i];
                     gPtr(i, j) = static_cast<int32_t>(
-                            nearbyint(saturate<int32_t, double>(val)));
+                            nearbyint(q10n::saturate<int32_t, double>(val)));
                 }
             }
         }
@@ -89,7 +89,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,
                 for (dim_t i = 0; i < m; i++) {
                     double val = alpha * (double)Ctemp[j * ldCtemp + i] + co[j];
                     gPtr(i, j) = static_cast<int32_t>(
-                            nearbyint(saturate<int32_t, double>(val)));
+                            nearbyint(q10n::saturate<int32_t, double>(val)));
                 }
             }
         } else {
@@ -98,7 +98,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,
                     double val = beta * (double)gPtr(i, j)
                             + alpha * (double)Ctemp[j * ldCtemp + i] + co[j];
                     gPtr(i, j) = static_cast<int32_t>(
-                            nearbyint(saturate<int32_t, double>(val)));
+                            nearbyint(q10n::saturate<int32_t, double>(val)));
                 }
             }
         }
@@ -107,7 +107,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,
             for (dim_t j = 0; j < n; j++) {
                 for (dim_t i = 0; i < m; i++) {
                     gPtr(i, j) = static_cast<int32_t>(
-                            nearbyint(saturate<int32_t, double>(
+                            nearbyint(q10n::saturate<int32_t, double>(
                                     alpha * (double)Ctemp[j * ldCtemp + i])));
                 }
             }
@@ -117,7 +117,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,
                     double val = beta * (double)gPtr(i, j)
                             + alpha * (double)Ctemp[j * ldCtemp + i];
                     gPtr(i, j) = static_cast<int32_t>(
-                            nearbyint(saturate<int32_t, double>(val)));
+                            nearbyint(q10n::saturate<int32_t, double>(val)));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,`
`50`	`50`	`for (dim_t i = 0; i < m; i++) {`
`51`	`51`	`double val = alpha * (double)Ctemp[j * ldCtemp + i] + co[0];`
`52`	`52`	`gPtr(i, j) = static_cast<int32_t>(`
`53`		`- nearbyint(saturate<int32_t, double>(val)));`
	`53`	`+ nearbyint(q10n::saturate<int32_t, double>(val)));`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`} else {`
`@@ -59,7 +59,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,`
`59`	`59`	`double val = beta * (double)gPtr(i, j)`
`60`	`60`	`+ alpha * (double)Ctemp[j * ldCtemp + i] + co[0];`
`61`	`61`	`gPtr(i, j) = static_cast<int32_t>(`
`62`		`- nearbyint(saturate<int32_t, double>(val)));`
	`62`	`+ nearbyint(q10n::saturate<int32_t, double>(val)));`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
`@@ -69,7 +69,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,`
`69`	`69`	`for (dim_t i = 0; i < m; i++) {`
`70`	`70`	`double val = alpha * (double)Ctemp[j * ldCtemp + i] + co[i];`
`71`	`71`	`gPtr(i, j) = static_cast<int32_t>(`
`72`		`- nearbyint(saturate<int32_t, double>(val)));`
	`72`	`+ nearbyint(q10n::saturate<int32_t, double>(val)));`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`} else {`
`@@ -78,7 +78,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,`
`78`	`78`	`double val = beta * (double)gPtr(i, j)`
`79`	`79`	`+ alpha * (double)Ctemp[j * ldCtemp + i] + co[i];`
`80`	`80`	`gPtr(i, j) = static_cast<int32_t>(`
`81`		`- nearbyint(saturate<int32_t, double>(val)));`
	`81`	`+ nearbyint(q10n::saturate<int32_t, double>(val)));`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -89,7 +89,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,`
`89`	`89`	`for (dim_t i = 0; i < m; i++) {`
`90`	`90`	`double val = alpha * (double)Ctemp[j * ldCtemp + i] + co[j];`
`91`	`91`	`gPtr(i, j) = static_cast<int32_t>(`
`92`		`- nearbyint(saturate<int32_t, double>(val)));`
	`92`	`+ nearbyint(q10n::saturate<int32_t, double>(val)));`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`} else {`
`@@ -98,7 +98,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,`
`98`	`98`	`double val = beta * (double)gPtr(i, j)`
`99`	`99`	`+ alpha * (double)Ctemp[j * ldCtemp + i] + co[j];`
`100`	`100`	`gPtr(i, j) = static_cast<int32_t>(`
`101`		`- nearbyint(saturate<int32_t, double>(val)));`
	`101`	`+ nearbyint(q10n::saturate<int32_t, double>(val)));`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`}`
`@@ -107,7 +107,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,`
`107`	`107`	`for (dim_t j = 0; j < n; j++) {`
`108`	`108`	`for (dim_t i = 0; i < m; i++) {`
`109`	`109`	`gPtr(i, j) = static_cast<int32_t>(`
`110`		`- nearbyint(saturate<int32_t, double>(`
	`110`	`+ nearbyint(q10n::saturate<int32_t, double>(`
`111`	`111`	`alpha * (double)Ctemp[j * ldCtemp + i])));`
`112`	`112`	`}`
`113`	`113`	`}`
`@@ -117,7 +117,7 @@ __attribute__((noinline)) void addResults(offset_type offsetType, dim_t m,`
`117`	`117`	`double val = beta * (double)gPtr(i, j)`
`118`	`118`	`+ alpha * (double)Ctemp[j * ldCtemp + i];`
`119`	`119`	`gPtr(i, j) = static_cast<int32_t>(`
`120`		`- nearbyint(saturate<int32_t, double>(val)));`
	`120`	`+ nearbyint(q10n::saturate<int32_t, double>(val)));`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`}`