From: Connor Abbott <cwabbott0@gmail.com>
Date: Fri, 2 Aug 2019 09:14:08 +0000 (+0200)
Subject: Revert "ac/nir: handle abs modifier"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a382d66ee1d6f9abba643ac94bb5b2058fa7797;p=mesa.git

Revert "ac/nir: handle abs modifier"

This reverts commit d3c80733cdfe8552b2f447ec8ed62465d0f2af1a.

These were only appearing due to memory corruption.
---

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index c0442f2688c..f78daf694e8 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -153,12 +153,6 @@ static LLVMBasicBlockRef get_block(struct ac_nir_context *nir,
 	return (LLVMBasicBlockRef)entry->data;
 }
 
-static LLVMValueRef emit_iabs(struct ac_llvm_context *ctx,
-			      LLVMValueRef src0)
-{
-	return ac_build_imax(ctx, src0, LLVMBuildNeg(ctx->builder, src0, ""));
-}
-
 static LLVMValueRef get_alu_src(struct ac_nir_context *ctx,
                                 nir_alu_src src,
                                 unsigned num_components)
@@ -194,37 +188,18 @@ static LLVMValueRef get_alu_src(struct ac_nir_context *ctx,
 		}
 	}
 
-	LLVMTypeRef type = LLVMTypeOf(value);
-	if (LLVMGetTypeKind(type) == LLVMVectorTypeKind)
-		type = LLVMGetElementType(type);
-
-	if (src.abs) {
-		if (LLVMGetTypeKind(type) == LLVMIntegerTypeKind) {
-			value = emit_iabs(&ctx->ac, value);
-		} else {
-			char name[128];
-			unsigned fsize = type == ctx->ac.f16 ? 16 :
-					 type == ctx->ac.f32 ? 32 : 64;
-
-			if (LLVMGetTypeKind(LLVMTypeOf(value)) == LLVMVectorTypeKind) {
-				snprintf(name, sizeof(name), "llvm.fabs.v%uf%u",
-					 LLVMGetVectorSize(LLVMTypeOf(value)), fsize);
-			} else {
-				snprintf(name, sizeof(name), "llvm.fabs.f%u", fsize);
-			}
-
-			value = ac_build_intrinsic(&ctx->ac, name, LLVMTypeOf(value),
-						   &value, 1, AC_FUNC_ATTR_READNONE);
-		}
-	}
-
 	if (src.negate) {
+		LLVMTypeRef type = LLVMTypeOf(value);
+		if (LLVMGetTypeKind(type) == LLVMVectorTypeKind)
+			type = LLVMGetElementType(type);
+
 		if (LLVMGetTypeKind(type) == LLVMIntegerTypeKind)
 			value = LLVMBuildNeg(ctx->ac.builder, value, "");
 		else
 			value = LLVMBuildFNeg(ctx->ac.builder, value, "");
 	}
 
+	assert(!src.abs);
 	return value;
 }
 
@@ -314,6 +289,12 @@ static LLVMValueRef emit_bcsel(struct ac_llvm_context *ctx,
 			       ac_to_integer_or_pointer(ctx, src2), "");
 }
 
+static LLVMValueRef emit_iabs(struct ac_llvm_context *ctx,
+			      LLVMValueRef src0)
+{
+	return ac_build_imax(ctx, src0, LLVMBuildNeg(ctx->builder, src0, ""));
+}
+
 static LLVMValueRef emit_uint_carry(struct ac_llvm_context *ctx,
 				    const char *intrin,
 				    LLVMValueRef src0, LLVMValueRef src1)