Mesa (master): aco: Annotate switch fallthroughs

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Dec 15 18:32:53 UTC 2020


Module: Mesa
Branch: master
Commit: 6ba83d820c17719d3c1500103df1bcc4efa45f06
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ba83d820c17719d3c1500103df1bcc4efa45f06

Author: Tony Wasserka <tony.wasserka at gmx.de>
Date:   Tue Dec  1 11:52:20 2020 +0100

aco: Annotate switch fallthroughs

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7847>

---

 src/amd/compiler/aco_instruction_selection.cpp | 2 ++
 src/amd/compiler/aco_ssa_elimination.cpp       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 4fcdad199d3..36cc72a4849 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -5364,12 +5364,14 @@ void visit_load_push_constant(isel_context *ctx, nir_intrinsic_instr *instr)
    case 3:
       vec = bld.tmp(s4);
       trim = true;
+      FALLTHROUGH;
    case 4:
       op = aco_opcode::s_load_dwordx4;
       break;
    case 6:
       vec = bld.tmp(s8);
       trim = true;
+      FALLTHROUGH;
    case 8:
       op = aco_opcode::s_load_dwordx8;
       break;
diff --git a/src/amd/compiler/aco_ssa_elimination.cpp b/src/amd/compiler/aco_ssa_elimination.cpp
index 261fd893fad..76a843a54cc 100644
--- a/src/amd/compiler/aco_ssa_elimination.cpp
+++ b/src/amd/compiler/aco_ssa_elimination.cpp
@@ -134,6 +134,7 @@ bool is_empty_block(Block* block, bool ignore_exec_writes)
          case aco_opcode::s_andn2_b32:
             if (ignore_exec_writes && instr->definitions[0].physReg() == exec)
                break;
+            return false;
          default:
             return false;
       }



More information about the mesa-commit mailing list