Add STRIDED_SLICE validations on neg stride with shrinkMask.

Fixes: 154639297
Test: NNT_static
Test: NNT_static_fuzzing
Change-Id: I2b37dd7fe07f3239682b5bc7f7cef0ae76134ad0

1 files changed, 11 insertions, 12 deletions

diff --git a/nn/runtime/test/fuzzing/operation_signatures/Selection.cpp b/nn/runtime/test/fuzzing/operation_signatures/Selection.cpp
index 6d45d0433..02612c0df 100644
--- a/nn/runtime/test/fuzzing/operation_signatures/Selection.cpp
+++ b/nn/runtime/test/fuzzing/operation_signatures/Selection.cpp
@@ -320,24 +320,23 @@ static void stridedSliceFinalizer(RandomOperation* op) {
             // arbitrary value.
             if (beginMask[i]) begin[i] = getUniform<int32_t>(-inputSize, inputSize - 1);
             if (endMask[i]) end[i] = getUniform<int32_t>(-inputSize, inputSize - 1);
+
+            // Switch to negative stride.
+            if (getBernoulli(0.2f)) {
+                op->inputs[3]->value<int32_t>(i) = -stride;
+                std::swap(begin[i], end[i]);
+                std::swap(beginMask[i], endMask[i]);
+                begin[i]--;
+                end[i]--;
+                // end = -1 will be interpreted to inputSize - 1 if not setting endMask.
+                if (end[i] < 0) endMask[i] = true;
+            }
         } else {
             // When shrink mask is set, the begin and end must define a slice of size 1, e.g.
             // begin[i] = x, end[i] = x + 1.
             begin[i] = getUniform<int32_t>(0, inputSize - 1);
             end[i] = begin[i] + 1;
         }
-
-        // Switch to negative stride.
-        // TODO(b/154639297): shrinkMask with negative stride will produce uninitialized output.
-        if (!shrink && getBernoulli(0.2f)) {
-            op->inputs[3]->value<int32_t>(i) = -stride;
-            std::swap(begin[i], end[i]);
-            std::swap(beginMask[i], endMask[i]);
-            begin[i]--;
-            end[i]--;
-            // end = -1 will be intepreted to inputSize - 1 if not setting endMask.
-            if (end[i] < 0) endMask[i] = true;
-        }
     }
     op->inputs[4]->setScalarValue<int32_t>(convertToBitMask(beginMask));
     op->inputs[5]->setScalarValue<int32_t>(convertToBitMask(endMask));