to also get rid of the additional function that I introduced before.
Fixes:
82b261417e53 ("util/cpu_detect: Add flag for IBM Z (s390x)")
Signed-off-by: Marius Hillenbrand <mhillen@linux.ibm.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13958>
return TRUE;
else if (util_get_cpu_caps()->has_neon)
return TRUE;
- else if (util_cpu_caps_has_zarch())
+ else if (util_get_cpu_caps()->family == CPU_S390X)
return TRUE;
return FALSE;
enum lp_build_round_mode mode)
{
if (util_get_cpu_caps()->has_sse4_1 || util_get_cpu_caps()->has_neon ||
- util_cpu_caps_has_zarch()) {
+ util_get_cpu_caps()->family == CPU_S390X) {
LLVMBuilderRef builder = bld->gallivm->builder;
const struct lp_type type = bld->type;
const char *intrinsic_root;
}
if (!util_get_cpu_caps()->has_neon &&
- !util_cpu_caps_has_zarch() &&
+ util_get_cpu_caps()->family != CPU_S390X &&
test->ref == &nearbyintf && length == 2 &&
ref != roundf(testval)) {
/* FIXME: The generic (non SSE) path in lp_build_iround, which is
check_os_mips64_support();
#endif /* PIPE_ARCH_MIPS64 */
+#if defined(PIPE_ARCH_S390)
+ util_cpu_caps.family = CPU_S390X;
+#endif
+
get_cpu_topology();
if (debug_get_option_dump_cpu()) {
CPU_AMD_ZEN3,
CPU_AMD_ZEN_NEXT,
CPU_AMD_LAST,
+
+ CPU_S390X,
};
typedef uint32_t util_affinity_mask[UTIL_MAX_CPUS / 32];
void util_cpu_detect(void);
-static inline bool
-util_cpu_caps_has_zarch(void)
-{
-#if defined(PIPE_ARCH_S390)
- return true;
-#else
- return false;
-#endif
-}
-
#ifdef __cplusplus
}