Revert "gallium/gallivm: fix compilation issues with llvm 11"

This reverts commit e2a7436dd10df70ba14d18ab7cf8ad538f80e653.

The corresponding LLVM changes were reverted.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2983
Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5087>

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_conv.c b/src/gallium/auxiliary/gallivm/lp_bld_conv.c
index 51eb3c31aee039a600756fc5251bf66d8c1923fd..55b4b2c052056ffd672f3931cdc18406063c9aba 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_conv.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_conv.c
@@ -93,7 +93,7 @@ lp_build_half_to_float(struct gallivm_state *gallivm,
 {
    LLVMBuilderRef builder = gallivm->builder;
    LLVMTypeRef src_type = LLVMTypeOf(src);
-   unsigned src_length = LLVMGetTypeKind(src_type) == LLVMFixedVectorTypeKind ?
+   unsigned src_length = LLVMGetTypeKind(src_type) == LLVMVectorTypeKind ?
                             LLVMGetVectorSize(src_type) : 1;
 
    struct lp_type f32_type = lp_type_float_vec(32, 32 * src_length);
@@ -152,7 +152,7 @@ lp_build_float_to_half(struct gallivm_state *gallivm,
 {
    LLVMBuilderRef builder = gallivm->builder;
    LLVMTypeRef f32_vec_type = LLVMTypeOf(src);
-   unsigned length = LLVMGetTypeKind(f32_vec_type) == LLVMFixedVectorTypeKind
+   unsigned length = LLVMGetTypeKind(f32_vec_type) == LLVMVectorTypeKind
                    ? LLVMGetVectorSize(f32_vec_type) : 1;
    struct lp_type i32_type = lp_type_int_vec(32, 32 * length);
    struct lp_type i16_type = lp_type_int_vec(16, 16 * length);

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_float.c b/src/gallium/auxiliary/gallivm/lp_bld_format_float.c
index 1d6647da556df80b8783c22cf01624edc2852001..1924650ca40905335774c66a7ef5bcfcb79583c4 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_format_float.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_format_float.c
@@ -240,7 +240,7 @@ lp_build_float_to_r11g11b10(struct gallivm_state *gallivm,
    LLVMValueRef dst, rcomp, bcomp, gcomp;
    struct lp_build_context i32_bld;
    LLVMTypeRef src_type = LLVMTypeOf(*src);
-   unsigned src_length = LLVMGetTypeKind(src_type) == LLVMFixedVectorTypeKind ?
+   unsigned src_length = LLVMGetTypeKind(src_type) == LLVMVectorTypeKind ?
                             LLVMGetVectorSize(src_type) : 1;
    struct lp_type i32_type = lp_type_int_vec(32, 32 * src_length);
 
@@ -406,7 +406,7 @@ lp_build_r11g11b10_to_float(struct gallivm_state *gallivm,
                             LLVMValueRef *dst)
 {
    LLVMTypeRef src_type = LLVMTypeOf(src);
-   unsigned src_length = LLVMGetTypeKind(src_type) == LLVMFixedVectorTypeKind ?
+   unsigned src_length = LLVMGetTypeKind(src_type) == LLVMVectorTypeKind ?
                             LLVMGetVectorSize(src_type) : 1;
    struct lp_type f32_type = lp_type_float_vec(32, 32 * src_length);
 
@@ -464,7 +464,7 @@ lp_build_rgb9e5_to_float(struct gallivm_state *gallivm,
    LLVMBuilderRef builder = gallivm->builder;
    LLVMTypeRef src_type = LLVMTypeOf(src);
    LLVMValueRef shift, scale, bias, exp;
-   unsigned src_length = LLVMGetTypeKind(src_type) == LLVMFixedVectorTypeKind ?
+   unsigned src_length = LLVMGetTypeKind(src_type) == LLVMVectorTypeKind ?
                             LLVMGetVectorSize(src_type) : 1;
    struct lp_type i32_type = lp_type_int_vec(32, 32 * src_length);
    struct lp_type u32_type = lp_type_uint_vec(32, 32 * src_length);

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_intr.c b/src/gallium/auxiliary/gallivm/lp_bld_intr.c
index 4a3aaa1d511cffcd8c555895fc62374b62937150..5e9cc70ef3d610de39d8deccc2269932e90df8e9 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_intr.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_intr.c
@@ -67,7 +67,7 @@ lp_format_intrinsic(char *name,
    char c;
 
    LLVMTypeKind kind = LLVMGetTypeKind(type);
-   if (kind == LLVMFixedVectorTypeKind) {
+   if (kind == LLVMVectorTypeKind) {
       length = LLVMGetVectorSize(type);
       type = LLVMGetElementType(type);
       kind = LLVMGetTypeKind(type);

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.c b/src/gallium/auxiliary/gallivm/lp_bld_pack.c
index 61e9651fd699418e0da6c18676c254097163bc7c..e1f652a9342b3fa164c488aadfe6bacdf85332a1 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_pack.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_pack.c
@@ -1035,7 +1035,7 @@ lp_build_pad_vector(struct gallivm_state *gallivm,
 
    type = LLVMTypeOf(src);
 
-   if (LLVMGetTypeKind(type) != LLVMFixedVectorTypeKind) {
+   if (LLVMGetTypeKind(type) != LLVMVectorTypeKind) {
       /* Can't use ShuffleVector on non-vector type */
       undef = LLVMGetUndef(LLVMVectorType(type, dst_length));
       return LLVMBuildInsertElement(gallivm->builder, undef, src, lp_build_const_int32(gallivm, 0), "");

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_printf.c b/src/gallium/auxiliary/gallivm/lp_bld_printf.c
index 6884407a83a01070e93a9b32ed46a91845a6ff59..a4233a24e3317cc98f0c1cb3afe60cdc73258826 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_printf.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_printf.c
@@ -92,7 +92,7 @@ lp_build_print_value(struct gallivm_state *gallivm,
    type_ref = LLVMTypeOf(value);
    type_kind = LLVMGetTypeKind(type_ref);
 
-   if (type_kind == LLVMFixedVectorTypeKind) {
+   if (type_kind == LLVMVectorTypeKind) {
       length = LLVMGetVectorSize(type_ref);
 
       type_ref = LLVMGetElementType(type_ref);

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
index 922ef0b7c9e24c44a4515d4fe613b4e851e39bd7..b648e6819941894800aeca49b0b52e6062e1d091 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c
@@ -50,7 +50,7 @@ lp_build_broadcast(struct gallivm_state *gallivm,
 {
    LLVMValueRef res;
 
-   if (LLVMGetTypeKind(vec_type) != LLVMFixedVectorTypeKind) {
+   if (LLVMGetTypeKind(vec_type) != LLVMVectorTypeKind) {
       /* scalar */
       assert(vec_type == LLVMTypeOf(scalar));
       res = scalar;

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.c b/src/gallium/auxiliary/gallivm/lp_bld_type.c
index 0b108702998619b1868e33883abe759e85af259b..da139a838ec411d655814a0ef0aaa2e1654fecbe 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_type.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.c
@@ -129,7 +129,7 @@ lp_check_vec_type(struct lp_type type, LLVMTypeRef vec_type)
    if (type.length == 1)
       return lp_check_elem_type(type, vec_type);
 
-   if(LLVMGetTypeKind(vec_type) != LLVMFixedVectorTypeKind)
+   if(LLVMGetTypeKind(vec_type) != LLVMVectorTypeKind)
       return FALSE;
 
    if(LLVMGetVectorSize(vec_type) != type.length)
@@ -259,7 +259,7 @@ lp_sizeof_llvm_type(LLVMTypeRef t)
       return 8 * sizeof(float);
    case LLVMDoubleTypeKind:
       return 8 * sizeof(double);
-   case LLVMFixedVectorTypeKind:
+   case LLVMVectorTypeKind:
       {
          LLVMTypeRef elem = LLVMGetElementType(t);
          unsigned len = LLVMGetVectorSize(t);
@@ -311,12 +311,8 @@ lp_typekind_name(LLVMTypeKind t)
       return "LLVMArrayTypeKind";
    case LLVMPointerTypeKind:
       return "LLVMPointerTypeKind";
-   case LLVMFixedVectorTypeKind:
-   #if LLVM_VERSION_MAJOR >= 11
-      return "LLVMFixedVectorTypeKind";
-   #else
+   case LLVMVectorTypeKind:
       return "LLVMVectorTypeKind";
-   #endif
    case LLVMMetadataTypeKind:
       return "LLVMMetadataTypeKind";
    default:
@@ -333,7 +329,7 @@ lp_dump_llvmtype(LLVMTypeRef t)
 {
    LLVMTypeKind k = LLVMGetTypeKind(t);
 
-   if (k == LLVMFixedVectorTypeKind) {
+   if (k == LLVMVectorTypeKind) {
       LLVMTypeRef te = LLVMGetElementType(t);
       LLVMTypeKind ke = LLVMGetTypeKind(te);
       unsigned len = LLVMGetVectorSize(t);

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.h b/src/gallium/auxiliary/gallivm/lp_bld_type.h
index f51ce4270716802c74ac3ddf6a17fe3e91952841..9c7dc252166d8e693f7abf633317a24c390a21dc 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_type.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.h
@@ -36,9 +36,6 @@
 #ifndef LP_BLD_TYPE_H
 #define LP_BLD_TYPE_H
 
-#if LLVM_VERSION_MAJOR < 11
-#define LLVMFixedVectorTypeKind LLVMVectorTypeKind
-#endif
 
 #include "util/format/u_format.h"
 #include "pipe/p_compiler.h"