From 395a298fa52adf04062b9fee98258b25c0f047e9 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Tue, 31 Oct 2017 16:46:59 -0500 Subject: [PATCH] swr/rast: Enable AVX-512 targets in the jitter Reviewed-by: Bruce Cherniak --- src/gallium/drivers/swr/rasterizer/core/knobs.h | 8 -------- src/gallium/drivers/swr/rasterizer/jitter/JitManager.h | 2 -- 2 files changed, 10 deletions(-) diff --git a/src/gallium/drivers/swr/rasterizer/core/knobs.h b/src/gallium/drivers/swr/rasterizer/core/knobs.h index fe0a044ae8f..e00e2da650f 100644 --- a/src/gallium/drivers/swr/rasterizer/core/knobs.h +++ b/src/gallium/drivers/swr/rasterizer/core/knobs.h @@ -61,18 +61,10 @@ #define KNOB_SIMD_WIDTH 8 #define KNOB_SIMD_BYTES 32 #elif (KNOB_ARCH == KNOB_ARCH_AVX512) -#if 0 -// not ready to enable this globally, enabled on the side (below) #define KNOB_ARCH_ISA AVX512F #define KNOB_ARCH_STR "AVX512" -#define KNOB_SIMD_WIDTH 16 -#define KNOB_SIMD_BYTES 64 -#else -#define KNOB_ARCH_ISA AVX2 -#define KNOB_ARCH_STR "AVX2" #define KNOB_SIMD_WIDTH 8 #define KNOB_SIMD_BYTES 32 -#endif #else #error "Unknown architecture" #endif diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h index 46ffe276a08..c30a807222d 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h +++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.h @@ -102,14 +102,12 @@ public: bForceAVX2 = true; bForceAVX512 = false; } - #if 0 else if(isaRequest == "avx512") { bForceAVX = false; bForceAVX2 = false; bForceAVX512 = true; } - #endif }; bool AVX2(void) { return bForceAVX ? 0 : InstructionSet::AVX2(); } -- 2.30.2