Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/trunk]: xsrc/external/mit/MesaLib.old/dist/src avoid xnack, and -fp32-d...



details:   https://anonhg.NetBSD.org/xsrc/rev/4bbb12a706bc
branches:  trunk
changeset: 10803:4bbb12a706bc
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Sep 05 03:57:27 2021 +0000

description:
avoid xnack, and -fp32-denormals, and +fp64-denormals options for
amdgpu / radeonsi driver.  these options don't work with llvm 13,
and generate warnings for all GL apps.

mesa 21 has entirely different code here.

diffstat:

 external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c          |  7 ++++---
 external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c |  4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r f30ee4ec53ee -r 4bbb12a706bc external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c
--- a/external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c       Sat Aug 28 13:30:24 2021 +0000
+++ b/external/mit/MesaLib.old/dist/src/amd/common/ac_llvm_util.c       Sun Sep 05 03:57:27 2021 +0000
@@ -151,11 +151,12 @@
        LLVMTargetRef target = ac_get_llvm_target(triple);
 
        snprintf(features, sizeof(features),
-                "+DumpCode,-fp32-denormals,+fp64-denormals%s%s%s%s%s%s",
+                "+DumpCode%s%s%s%s%s%s%s",
+                HAVE_LLVM >= 0x0B00 ? "" : ",-fp32-denormals,+fp64-denormals",
                 HAVE_LLVM >= 0x0800 ? "" : ",+vgpr-spilling",
                 tm_options & AC_TM_SISCHED ? ",+si-scheduler" : "",
-                tm_options & AC_TM_FORCE_ENABLE_XNACK ? ",+xnack" : "",
-                tm_options & AC_TM_FORCE_DISABLE_XNACK ? ",-xnack" : "",
+                (tm_options & AC_TM_FORCE_ENABLE_XNACK) && HAVE_LLVM <= 0x0800 ? ",+xnack" : "",
+                (tm_options & AC_TM_FORCE_DISABLE_XNACK) && HAVE_LLVM <= 0x0800 ? ",-xnack" : "",
                 tm_options & AC_TM_PROMOTE_ALLOCA_TO_SCRATCH ? ",-promote-alloca" : "",
                 tm_options & AC_TM_NO_LOAD_STORE_OPT ? ",-load-store-opt" : "");
 
diff -r f30ee4ec53ee -r 4bbb12a706bc external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c
--- a/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c      Sat Aug 28 13:30:24 2021 +0000
+++ b/external/mit/MesaLib.old/dist/src/gallium/drivers/radeonsi/si_pipe.c      Sun Sep 05 03:57:27 2021 +0000
@@ -120,8 +120,8 @@
        enum ac_target_machine_options tm_options =
                (sscreen->debug_flags & DBG(SI_SCHED) ? AC_TM_SISCHED : 0) |
                (sscreen->debug_flags & DBG(GISEL) ? AC_TM_ENABLE_GLOBAL_ISEL : 0) |
-               (sscreen->info.chip_class >= GFX9 ? AC_TM_FORCE_ENABLE_XNACK : 0) |
-               (sscreen->info.chip_class < GFX9 ? AC_TM_FORCE_DISABLE_XNACK : 0) |
+               (sscreen->info.chip_class >= VI ? AC_TM_FORCE_ENABLE_XNACK : 0) |
+               (sscreen->info.chip_class < VI ? AC_TM_FORCE_DISABLE_XNACK : 0) |
                (!sscreen->llvm_has_working_vgpr_indexing ? AC_TM_PROMOTE_ALLOCA_TO_SCRATCH : 0) |
                (sscreen->debug_flags & DBG(CHECK_IR) ? AC_TM_CHECK_IR : 0) |
                (create_low_opt_compiler ? AC_TM_CREATE_LOW_OPT : 0);



Home | Main Index | Thread Index | Old Index