gallivm,ac: add LP_FUNC_ATTR_CONVERGENT

Reviewed-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c
index 2598875ab70a4ae4d021bc09c7c2184c38beb848..4b5d2fe8ab0aa44fc90064611568f90a5bd63cd1 100644 (file)
--- a/src/amd/common/ac_llvm_util.c
+++ b/src/amd/common/ac_llvm_util.c
@@ -174,6 +174,7 @@ static const char *attr_to_str(enum ac_func_attr attr)
    case AC_FUNC_ATTR_READONLY: return "readonly";
    case AC_FUNC_ATTR_WRITEONLY: return "writeonly";
    case AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY: return "inaccessiblememonly";
+   case AC_FUNC_ATTR_CONVERGENT: return "convergent";
    default:
           fprintf(stderr, "Unhandled function attribute: %x\n", attr);
           return 0;

diff --git a/src/amd/common/ac_llvm_util.h b/src/amd/common/ac_llvm_util.h
index e786bb7337175a1fee192beb29c356b6a1da2641..4b0ccdd38ffc7c43279371091d6862c360a82b81 100644 (file)
--- a/src/amd/common/ac_llvm_util.h
+++ b/src/amd/common/ac_llvm_util.h
@@ -43,6 +43,7 @@ enum ac_func_attr {
        AC_FUNC_ATTR_READONLY     = (1 << 6),
        AC_FUNC_ATTR_WRITEONLY    = HAVE_LLVM >= 0x0400 ? (1 << 7) : 0,
        AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY = HAVE_LLVM >= 0x0400 ? (1 << 8) : 0,
+       AC_FUNC_ATTR_CONVERGENT = HAVE_LLVM >= 0x0400 ? (1 << 9) : 0,
 
        /* Legacy intrinsic that needs attributes on function declarations
         * and they must match the internal LLVM definition exactly, otherwise

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_intr.c b/src/gallium/auxiliary/gallivm/lp_bld_intr.c
index 07d31029c3e9a3806b27a28c42e9c299913d5867..19f98bb781ff63f96a8c60727d6d4974c3c76675 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_intr.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_intr.c
@@ -152,6 +152,7 @@ static const char *attr_to_str(enum lp_func_attr attr)
    case LP_FUNC_ATTR_READONLY: return "readonly";
    case LP_FUNC_ATTR_WRITEONLY: return "writeonly";
    case LP_FUNC_ATTR_INACCESSIBLE_MEM_ONLY: return "inaccessiblememonly";
+   case LP_FUNC_ATTR_CONVERGENT: return "convergent";
    default:
       _debug_printf("Unhandled function attribute: %x\n", attr);
       return 0;

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_intr.h b/src/gallium/auxiliary/gallivm/lp_bld_intr.h
index 7bd6efa456872222ff841a6d369a1f96d8934da7..0a929c51970e8721e7329e6ff207ea9876d1be46 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_intr.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_intr.h
@@ -56,6 +56,7 @@ enum lp_func_attr {
    LP_FUNC_ATTR_READONLY     = (1 << 6),
    LP_FUNC_ATTR_WRITEONLY    = HAVE_LLVM >= 0x0400 ? (1 << 7) : 0,
    LP_FUNC_ATTR_INACCESSIBLE_MEM_ONLY = HAVE_LLVM >= 0x0400 ? (1 << 8) : 0,
+   LP_FUNC_ATTR_CONVERGENT   = HAVE_LLVM >= 0x0400 ? (1 << 9) : 0,
 
    /* Legacy intrinsic that needs attributes on function declarations
     * and they must match the internal LLVM definition exactly, otherwise