diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py
index 939bc0f79cd..b0e100c9815 100644
--- a/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@ -2018,6 +2018,20 @@ for pack, bits, compbits in [('pack_64_2x32', 64, 32), ('pack_32_2x16', 32, 16)]
         ((pack, (unpack, a)), a),
     ]
 
+# No-op extracts from packs.
+for (bits, chans, compbits) in ((32, 4, 8), (32, 2, 16), (64, 4, 16)):
+    for chan in range(chans):
+        chanvar = 'abcd'[chan]
+        optimizations += [((f'extract_i{compbits}', (f'pack_{bits}_{chans}x{compbits}', a), chan), ('i2i', 'a.' + 'xyzw'[chan]))]
+        optimizations += [((f'extract_u{compbits}', (f'pack_{bits}_{chans}x{compbits}', a), chan), ('u2u', 'a.' + 'xyzw'[chan]))]
+        if not (bits == 64 and compbits == 16):
+            if chans == 4:
+                optimizations += [((f'extract_i{compbits}', (f'pack_{bits}_{chans}x{compbits}_split', a, b, c, d), chan), ('i2i', chanvar))]
+                optimizations += [((f'extract_u{compbits}', (f'pack_{bits}_{chans}x{compbits}_split', a, b, c, d), chan), ('u2u', chanvar))]
+            if chans == 2:
+                optimizations += [((f'extract_i{compbits}', (f'pack_{bits}_{chans}x{compbits}_split', a, b), chan), ('i2i', chanvar))]
+                optimizations += [((f'extract_u{compbits}', (f'pack_{bits}_{chans}x{compbits}_split', a, b), chan), ('u2u', chanvar))]
+
 optimizations.extend([
    (('unpack_64_2x32_split_y', ('u2u64', 'a@1')), 0),
    (('unpack_64_2x32_split_y', ('u2u64', 'a@8')), 0),