[ref model] Change PadOp's padding to Shape

Changed to use pad input of PadOp for testing.
The pad input is now a tensor of tosa.shape type.

moved padding error checking from checkTensorAttributes to eval
modified pad's PadOutputShapeMismatch test generation to avoid
generating output shapes with dimensions <= 0

Signed-off-by: Tai Ly <tai.ly@arm.com>
Change-Id: I437c86d9a012903458a648667f6693db67b97d76

2 files changed, 25 insertions, 22 deletions

diff --git a/reference_model/src/ops/data_layout.cc b/reference_model/src/ops/data_layout.cc
index a4b4e0a..14f2918 100644
--- a/reference_model/src/ops/data_layout.cc
+++ b/reference_model/src/ops/data_layout.cc
@@ -126,7 +126,7 @@ template <int Rank, TOSA_REF_TYPE Dtype>
 OpPad<Rank, Dtype>::OpPad(SubgraphTraverser* sgt_, TosaAttributeBase* attribute_, uint64_t id_)
     : GraphNode(sgt_, Op_PAD, id_)
 {
-    setRequiredOperands(1, 1);
+    setRequiredOperands(2, 1);
     setRequiredRank(1);
 
     INIT_ATTRIBUTE(Pad);
@@ -158,25 +158,11 @@ int OpPad<Rank, Dtype>::checkTensorAttributes()
         return 1;
     }
 
-    in  = dynamic_cast<TosaReference::TensorTemplate<TIn>*>(inputs[0]);
-    out = dynamic_cast<TosaReference::TensorTemplate<TOut>*>(outputs[0]);
+    in      = dynamic_cast<TosaReference::TensorTemplate<TIn>*>(inputs[0]);
+    padding = dynamic_cast<TosaReference::TensorTemplate<TPadding>*>(inputs[1]);
+    out     = dynamic_cast<TosaReference::TensorTemplate<TOut>*>(outputs[0]);
     ASSERT_MEM(in && out);
 
-    // padding in spec is 2D array in shape of [Rank, 2]
-    // Reference model implement this as 1D array of [Rank * 2], with ordering:
-    // [Rank0_front, Rank0_back, Rank1_front, Rank1_back, ..., Rank(N-1)_front, Rank(N-1)_back]
-    ERROR_IF(attribute->padding().size() != (Rank * 2), "OpPad: padding length needs to be (rank(input1) * 2)");
-
-    for (int i = 0; i < Rank; i++)
-    {
-        int32_t pad_front = attribute->padding()[2 * i];
-        int32_t pad_back  = attribute->padding()[2 * i + 1];
-        ERROR_IF((pad_front < 0) || (pad_back < 0), "OpPad: padding can't be smaller than 0");
-        ERROR_IF(out->getShape()[i] != pad_front + in->getShape()[i] + pad_back,
-                 "OpPad: output shape not equal to input plus padding");
-        paddings_array[i] = std::make_pair(pad_front, pad_back);
-    }
-
     return 0;
 }
 
@@ -204,6 +190,20 @@ int OpPad<Rank, Dtype>::eval()
             break;
     }
 
+    // padding is an 1D array of [Rank * 2], with ordering:
+    // [Rank0_front, Rank0_back, Rank1_front, Rank1_back, ..., Rank(N-1)_front, Rank(N-1)_back]
+    TPadding padding_val = this->padding->getTensor();
+    ERROR_IF(padding_val.size() != (Rank * 2), "OpPad: padding length needs to be (rank(input1) * 2)");
+    for (int i = 0; i < Rank; i++)
+    {
+        auto pad_front = padding_val(2 * i);
+        auto pad_back  = padding_val(2 * i + 1);
+        ERROR_IF((pad_front < 0) || (pad_back < 0), "OpPad: padding can't be smaller than 0");
+        ERROR_IF(out->getShape()[i] != pad_front + in->getShape()[i] + pad_back,
+                 "OpPad: output shape not equal to input plus padding");
+        paddings_array[i] = std::make_pair(pad_front, pad_back);
+    }
+
     this->out->getTensor() = this->in->getTensor().pad(this->paddings_array, pad_value);
 
     return GraphNode::eval();
diff --git a/reference_model/src/ops/data_layout.h b/reference_model/src/ops/data_layout.h
index 9341709..e085b8e 100644
--- a/reference_model/src/ops/data_layout.h
+++ b/reference_model/src/ops/data_layout.h
@@ -54,14 +54,17 @@ public:
     virtual int checkTensorAttributes();
     virtual int eval();
 
-    using InEigenType  = typename GetEigenType<Dtype>::type;
-    using OutEigenType = typename GetEigenType<Dtype>::type;
-    using TIn          = Eigen::Tensor<InEigenType, Rank>;
-    using TOut         = Eigen::Tensor<OutEigenType, Rank>;
+    using InEigenType      = typename GetEigenType<Dtype>::type;
+    using InEigenShapeType = typename GetEigenType<TOSA_REF_TYPE_SHAPE>::type;
+    using OutEigenType     = typename GetEigenType<Dtype>::type;
+    using TIn              = Eigen::Tensor<InEigenType, Rank>;
+    using TPadding         = Eigen::Tensor<InEigenShapeType, 1>;
+    using TOut             = Eigen::Tensor<OutEigenType, Rank>;
 
 protected:
     Eigen::array<std::pair<ptrdiff_t, ptrdiff_t>, Rank> paddings_array;
     TosaReference::TensorTemplate<TIn>* in;
+    TosaReference::TensorTemplate<TPadding>* padding;
     TosaReference::TensorTemplate<TOut>* out;
     TosaPadAttribute* attribute;
 };