diff --git a/src/gallium/drivers/lima/ir/pp/nir.c b/src/gallium/drivers/lima/ir/pp/nir.c
index fbba1ce8e7e..54e208c63ed 100644
--- a/src/gallium/drivers/lima/ir/pp/nir.c
+++ b/src/gallium/drivers/lima/ir/pp/nir.c
@@ -450,15 +450,17 @@ static bool ppir_emit_intrinsic(ppir_block *block, nir_instr *ni)
          switch (node->op) {
          case ppir_op_load_uniform:
          case ppir_op_load_texture:
-         case ppir_op_dummy:
          case ppir_op_const:
+         case ppir_op_dummy:
             break;
          default: {
             ppir_dest *dest = ppir_node_get_dest(node);
             dest->ssa.out_type = out_type;
+            dest->ssa.out_reg = true;
             dest->ssa.num_components = 4;
             dest->write_mask = u_bit_consecutive(0, 4);
             node->is_out = 1;
+            block->stop = true;
             return true;
             }
          }
@@ -474,6 +476,7 @@ static bool ppir_emit_intrinsic(ppir_block *block, nir_instr *ni)
       dest->ssa.index = 0;
       dest->write_mask = u_bit_consecutive(0, 4);
       dest->ssa.out_type = out_type;
+      dest->ssa.out_reg = true;
 
       alu_node->num_src = 1;
 
@@ -484,6 +487,7 @@ static bool ppir_emit_intrinsic(ppir_block *block, nir_instr *ni)
                         u_bit_consecutive(0, 4));
 
       alu_node->node.is_out = 1;
+      block->stop = true;
 
       list_addtail(&alu_node->node.list, &block->node_list);
       return true;
@@ -798,7 +802,7 @@ static bool ppir_emit_if(ppir_compiler *comp, nir_if *if_stmt)
       nir_block *nblock = nir_if_last_else_block(if_stmt);
       assert(nblock->successors[0]);
       assert(!nblock->successors[1]);
-      else_branch->target = ppir_get_block(comp, nblock->successors[0]);
+      else_branch->target = ppir_get_block(comp, nblock);
       /* Add empty else block to the list */
       list_addtail(&block->successors[1]->list, &comp->block_list);
       return true;
@@ -1063,13 +1067,19 @@ bool ppir_compile_nir(struct lima_fs_compiled_shader *prog, struct nir_shader *n
 
    ppir_node_print_prog(comp);
 
+   ppir_debug("ppir_lower_prog()\n");
    if (!ppir_lower_prog(comp))
       goto err_out0;
 
+   ppir_debug("ppir_add_order_deps()\n");
    ppir_add_ordering_deps(comp);
+   ppir_debug("ppir_add_write_after_read_deps()\n");
    ppir_add_write_after_read_deps(comp);
+   ppir_debug("ppir_opt_prog()\n");
+   ppir_opt_prog(comp);
 
    ppir_node_print_prog(comp);
+   fflush(stdout);
 
    if (!ppir_node_to_instr(comp))
       goto err_out0;
diff --git a/src/gallium/drivers/lima/ir/pp/node.c b/src/gallium/drivers/lima/ir/pp/node.c
index ffcda28330c..d5c83025c4f 100644
--- a/src/gallium/drivers/lima/ir/pp/node.c
+++ b/src/gallium/drivers/lima/ir/pp/node.c
@@ -723,7 +723,17 @@ void ppir_node_print_prog(ppir_compiler *comp)
 
    printf("========prog========\n");
    list_for_each_entry(ppir_block, block, &comp->block_list, list) {
-      printf("-------block %3d-------\n", block->index);
+      printf("*** block %3d", block->index);
+      if (block->successors[0] || block->successors[1]) {
+         printf(", successors:");
+         for (int i = 0; i < 2; i++) {
+            if (block->successors[i])
+               printf(" %d", block->successors[i]->index);
+         }
+      }
+      if (block->stop)
+         printf(", stop");
+      printf("\n");
       list_for_each_entry(ppir_node, node, &block->node_list, list) {
          if (ppir_node_is_root(node))
             ppir_node_print_node(node, 0);
diff --git a/src/gallium/drivers/lima/ir/pp/opt.c b/src/gallium/drivers/lima/ir/pp/opt.c
new file mode 100644
index 00000000000..8ac2b26b565
--- /dev/null
+++ b/src/gallium/drivers/lima/ir/pp/opt.c
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2025 Lima Project
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "util/list.h"
+#include "util/ralloc.h"
+#include "ppir.h"
+
+/* Checks is successor is sequential, as in there is no branch in the block
+ * that points to the successor */
+static bool ppir_block_succ_is_seq(ppir_block *pred, ppir_block *succ)
+{
+   list_for_each_entry_safe(ppir_node, node, &pred->node_list, list) {
+      if (node->op == ppir_op_branch) {
+         ppir_branch_node *branch = ppir_node_to_branch(node);
+         if (branch->target == succ)
+            return false;
+      }
+   }
+
+   return true;
+}
+
+static void ppir_block_update_successor(ppir_block *pred,
+                                        ppir_block *old_succ,
+                                        ppir_block *new_succ)
+{
+   list_for_each_entry_safe(ppir_node, node, &pred->node_list, list) {
+      if (node->op == ppir_op_branch) {
+         ppir_branch_node *branch = ppir_node_to_branch(node);
+         if (branch->target == old_succ)
+            branch->target = new_succ;
+         if (branch->target == NULL) {
+            /* We can only remove unconditional branches */
+            assert(ppir_node_get_src_num(node) == 0);
+            ppir_node_delete(node);
+         }
+      }
+   }
+
+   for (int i = 0; i < 2; i++) {
+      if (pred->successors[i] == old_succ)
+        pred->successors[i] = new_succ;
+   }
+
+   if (!new_succ)
+      pred->stop = true;
+}
+
+static bool ppir_propagate_block_successors(ppir_compiler *comp)
+{
+   bool progress = false;
+   list_for_each_entry(ppir_block, block, &comp->block_list, list) {
+      for (int i = 0; i < 2; i++) {
+         if (block->successors[i] && ppir_block_is_empty(block->successors[i])) {
+            ppir_block *succ_block = block->successors[i];
+            assert(!succ_block->successors[1]);
+            ppir_block_update_successor(block, block->successors[i], succ_block->successors[0]);
+            progress = true;
+         }
+      }
+   }
+   return progress;
+}
+
+/* Removes empty blocks */
+static bool ppir_remove_empty_blocks(ppir_compiler *comp)
+{
+   bool progress = false;
+   if (list_is_singular(&comp->block_list))
+      return progress;
+
+   do {
+      progress = ppir_propagate_block_successors(comp);
+   } while (progress);
+
+   list_for_each_entry_safe(ppir_block, block, &comp->block_list, list) {
+      if (ppir_block_is_empty(block)) {
+         progress = true;
+         list_del(&block->list);
+         ralloc_free(block);
+      }
+   }
+
+   return progress;
+}
+
+static ppir_node *ppir_block_first_node(ppir_block *block)
+{
+   return list_first_entry(&block->node_list, ppir_node, list);
+}
+
+static bool ppir_node_is_identity_reg_mov(ppir_node *node)
+{
+   if (node->op != ppir_op_mov)
+      return false;
+
+   ppir_src *src = ppir_node_get_src(node, 0);
+   if (src->type != ppir_target_register)
+      return false;
+
+   return ppir_src_swizzle_is_identity(ppir_node_get_src(node, 0));
+}
+
+/* Find "stop" block, if it contains a single instruction that is store
+ * output, check if all the predecessor blocks are either sequential or branch
+ * to this block unconditionally. If it is the case, we can drop the mov and
+ * mark source register as output
+ *
+ * If it is not a single instruction, it can be dropped unconditionally
+ *
+ * Returns true, if needs to be run again
+ */
+static bool ppir_opt_store_output(ppir_compiler *comp)
+{
+   bool progress = false;
+   bool single_block = list_is_singular(&comp->block_list);
+   ppir_block *stop = NULL;
+
+   /* Can't optimize store output for programs that use discard */
+   if (comp->uses_discard)
+      return false;
+
+   /* We are assuming that there is only one "stop" block at the moment */
+   list_for_each_entry_safe(ppir_block, block, &comp->block_list, list) {
+      if (block->stop) {
+         assert(!stop);
+         stop = block;
+      }
+   }
+
+   /* No stop block in empty program */
+   if (!stop)
+      return false;
+
+   ppir_node *out_node = NULL;
+   if (list_is_singular(&stop->node_list)) {
+      if (single_block)
+         return false;
+      ppir_node *out_node = ppir_block_first_node(stop);
+      if (!ppir_node_is_identity_reg_mov(out_node))
+         return false;
+
+      list_for_each_entry(ppir_block, block, &comp->block_list, list) {
+         list_for_each_entry(ppir_node, node, &block->node_list, list) {
+            if (node->op == ppir_op_branch) {
+               ppir_branch_node *branch = ppir_node_to_branch(node);
+               if (branch->target == stop && ppir_node_get_src_num(node) != 0)
+                  return false;
+            }
+         }
+      }
+   } else {
+      list_for_each_entry_safe(ppir_node, node, &stop->node_list, list) {
+         if (node->is_out && ppir_node_is_identity_reg_mov(node)) {
+            out_node = node;
+            progress = true;
+         }
+      }
+   }
+
+   if (!out_node)
+      return false;
+
+   ppir_reg *dest_reg = ppir_dest_get_reg(ppir_node_get_dest(out_node));
+   ppir_reg *src_reg = ppir_src_get_reg(ppir_node_get_src(out_node, 0));
+
+   src_reg->out_type = dest_reg->out_type;
+   src_reg->out_reg = true;
+
+   ppir_node_delete(out_node);
+
+   return progress;
+}
+
+static bool ppir_node_has_succ(ppir_compiler *comp, ppir_node *node)
+{
+   ppir_dest *dest = ppir_node_get_dest(node);
+   if (!dest)
+      return true;
+
+   if (node->is_out)
+      return true;
+
+   /* Output registers do not have explicit reads in program */
+   if (dest->type == ppir_target_register && dest->reg->out_reg)
+      return true;
+
+   list_for_each_entry(ppir_block, block, &comp->block_list, list) {
+      list_for_each_entry(ppir_node, n, &block->node_list, list) {
+         for (int i = 0; i < ppir_node_get_src_num(n); i++) {
+            ppir_dest *ndest = ppir_node_get_dest(n);
+            ppir_src *src = ppir_node_get_src(n, i);
+            if (src->type != dest->type)
+               continue;
+            switch (src->type) {
+            case ppir_target_pipeline:
+               continue;
+            case ppir_target_ssa:
+               if (src->node == node)
+                  return true;
+               break;
+            case ppir_target_register:
+               if (src->reg->index != dest->reg->index)
+                  continue;
+               /* Check only components that are written by the node */
+               for (int i = 0; i < 4; i++) {
+                  if (!(dest->write_mask & (1 << i)))
+                     continue;
+                  if (ndest) {
+                     /* Match only components that are read by n */
+                     for (int j = 0; j < 4; j++) {
+                        if (!(ndest->write_mask & (1 << j)))
+                           continue;
+                        if (src->swizzle[j] == i)
+                           return true;
+                     }
+                  } else {
+                     for (int j = 0; j < src->reg->num_components; i++) {
+                        if (src->swizzle[j] == i)
+                           return true;
+                     }
+                  }
+               }
+               break;
+            }
+         }
+      }
+   }
+
+   return false;
+}
+
+/* Dead code elimination */
+static bool ppir_dce(ppir_compiler *comp)
+{
+
+   list_for_each_entry(ppir_block, block, &comp->block_list, list) {
+      list_for_each_entry_safe(ppir_node, node, &block->node_list, list) {
+         if (ppir_node_is_root(node) && !ppir_node_has_succ(comp, node)) {
+            ppir_debug("DCE: deleting node %d\n", node->index);
+            ppir_node_delete(node);
+            return true;
+         }
+      }
+   }
+
+   return false;
+}
+
+bool ppir_opt_prog(ppir_compiler *comp)
+{
+   bool progress;
+
+   do {
+      progress  = ppir_remove_empty_blocks(comp);
+      progress |= ppir_opt_store_output(comp);
+   } while (progress);
+
+   do {
+      progress  = ppir_remove_empty_blocks(comp);
+      progress |= ppir_dce(comp);
+   } while (progress);
+
+   return true;
+}
diff --git a/src/gallium/drivers/lima/ir/pp/ppir.h b/src/gallium/drivers/lima/ir/pp/ppir.h
index f9d82bbd860..5766059a6fd 100644
--- a/src/gallium/drivers/lima/ir/pp/ppir.h
+++ b/src/gallium/drivers/lima/ir/pp/ppir.h
@@ -729,6 +729,19 @@ static inline bool ppir_node_schedulable_slot(ppir_node *node,
    return false;
 }
 
+static bool inline ppir_block_is_empty(ppir_block *block)
+{
+   return list_is_empty(&block->node_list);
+}
+
+static bool ppir_src_swizzle_is_identity(ppir_src *src)
+{
+   uint8_t identity[4] = { PIPE_SWIZZLE_X, PIPE_SWIZZLE_Y,
+                           PIPE_SWIZZLE_Z, PIPE_SWIZZLE_W };
+
+   return memcmp(src->swizzle, identity, sizeof(identity)) == 0;
+}
+
 ppir_instr *ppir_instr_create(ppir_block *block);
 bool ppir_instr_insert_node(ppir_instr *instr, ppir_node *node);
 void ppir_instr_add_dep(ppir_instr *succ, ppir_instr *pred);
@@ -761,6 +774,7 @@ bool ppir_schedule_prog(ppir_compiler *comp);
 bool ppir_regalloc_prog(ppir_compiler *comp);
 bool ppir_codegen_prog(ppir_compiler *comp);
 void ppir_liveness_analysis(ppir_compiler *comp);
+bool ppir_opt_prog(ppir_compiler *comp);
 
 static inline unsigned int reg_mask_size(unsigned int num_reg)
 {
diff --git a/src/gallium/drivers/lima/meson.build b/src/gallium/drivers/lima/meson.build
index 19af71d7523..c74b84b0314 100644
--- a/src/gallium/drivers/lima/meson.build
+++ b/src/gallium/drivers/lima/meson.build
@@ -27,6 +27,7 @@ files_lima = files(
   'ir/pp/codegen.c',
   'ir/pp/node_to_instr.c',
   'ir/pp/disasm.c',
+  'ir/pp/opt.c',
 
   'ir/lima_nir_duplicate_consts.c',
   'ir/lima_nir_duplicate_intrinsic.c',