diff options
author | Kevin Cheng <kevin.cheng@arm.com> | 2021-06-29 15:32:19 -0700 |
---|---|---|
committer | Kevin Cheng <kevin.cheng@arm.com> | 2021-08-20 18:07:06 +0100 |
commit | acb550f4410ae861e53cae27a9feb4b11d45769f (patch) | |
tree | ae2f4ec558c2cdf1afa020b80a09d7ab4be5ef6d /reference_model/src/ops/ewise_binary.h | |
parent | 68e7aee65bda5ac03fa7def753b7dc7462554793 (diff) | |
download | reference_model-acb550f4410ae861e53cae27a9feb4b11d45769f.tar.gz |
Replace node level check ASSERT_MSG_NODE()/FATAL_ERROR_NODE() with REQUIRE() or ERROR_IF()
- Adding return code enum class: {VALID, UNPREDICTABLE, ERROR}
- Runtime errors (e.g. memory allocation failure) will abort immediately, or will return one of the three return codes
Part of the codes are re-written to pass REQUIRE() to the top-level (e.g. apply_scale_32/16())
- Update setExpectedFailure() to setExpectedReturnCode() on test generation script
- Update test regression script to interface with reference model change
Signed-off-by: Kevin Cheng <kevin.cheng@arm.com>
Change-Id: Ia063c936bcb2a54d6e379a5bb6801aa72d1186f1
Diffstat (limited to 'reference_model/src/ops/ewise_binary.h')
-rw-r--r-- | reference_model/src/ops/ewise_binary.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/reference_model/src/ops/ewise_binary.h b/reference_model/src/ops/ewise_binary.h index a5b1059..86b2101 100644 --- a/reference_model/src/ops/ewise_binary.h +++ b/reference_model/src/ops/ewise_binary.h @@ -42,7 +42,7 @@ template <int Rank, DType InDtype, DType OutDtype> class BinaryNodeBase : public GraphNode { public: - BinaryNodeBase(const Op& nodeType, TosaQuantInfoBase* qinfo_, const uint64_t id_); + BinaryNodeBase(SubgraphTraverser* sgt_, const Op& nodeType, TosaQuantInfoBase* qinfo_, const uint64_t id_); virtual ~BinaryNodeBase(); virtual int checkTensorAttributes() final; @@ -76,8 +76,8 @@ template <int Rank, DType InDtype, DType OutDtype> class BinaryNode : public BinaryNodeBase<Rank, InDtype, OutDtype> { public: - BinaryNode(const Op& op_, TosaQuantInfoBase* qinfo_, const uint64_t id_) - : BinaryNodeBase<Rank, InDtype, OutDtype>(op_, qinfo_, id_) + BinaryNode(SubgraphTraverser* sgt_, const Op& op_, TosaQuantInfoBase* qinfo_, const uint64_t id_) + : BinaryNodeBase<Rank, InDtype, OutDtype>(sgt_, op_, qinfo_, id_) {} virtual ~BinaryNode() {} @@ -95,8 +95,8 @@ template <DType InDtype, DType OutDtype> class BinaryNode<0, InDtype, OutDtype> : public BinaryNodeBase<0, InDtype, OutDtype> { public: - BinaryNode(const Op& op_, TosaQuantInfoBase* qinfo_, const uint64_t id_) - : BinaryNodeBase<0, InDtype, OutDtype>(op_, qinfo_, id_) + BinaryNode(SubgraphTraverser* sgt_, const Op& op_, TosaQuantInfoBase* qinfo_, const uint64_t id_) + : BinaryNodeBase<0, InDtype, OutDtype>(sgt_, op_, qinfo_, id_) {} virtual ~BinaryNode() {} @@ -109,8 +109,8 @@ public: class Op##Opname : public BinaryNode<Rank, Dtype, Dtype> \ { \ public: \ - Op##Opname(TosaAttributeBase* attribute_, TosaQuantInfoBase* qinfo_, uint64_t id_) \ - : BinaryNode<Rank, Dtype, Dtype>(Op_##OPNAME, qinfo_, id_) \ + Op##Opname(SubgraphTraverser* sgt_, TosaAttributeBase* attribute_, TosaQuantInfoBase* qinfo_, uint64_t id_) \ + : BinaryNode<Rank, Dtype, Dtype>(sgt_, Op_##OPNAME, qinfo_, id_) \ { \ register_fcn(); \ } \ @@ -142,8 +142,11 @@ template <int Rank, DType Dtype> class OpArithmeticRightShift : public BinaryNode<Rank, Dtype, Dtype> { public: - OpArithmeticRightShift(TosaAttributeBase* attribute_, TosaQuantInfoBase* qinfo_, uint64_t id_) - : BinaryNode<Rank, Dtype, Dtype>(Op_ARITHMETIC_RIGHT_SHIFT, qinfo_, id_) + OpArithmeticRightShift(SubgraphTraverser* sgt_, + TosaAttributeBase* attribute_, + TosaQuantInfoBase* qinfo_, + uint64_t id_) + : BinaryNode<Rank, Dtype, Dtype>(sgt_, Op_ARITHMETIC_RIGHT_SHIFT, qinfo_, id_) { INIT_ATTRIBUTE(ArithmeticRightShift); register_fcn(); @@ -160,8 +163,8 @@ template <int Rank, DType InDtype, DType OutDtype> class OpMul : public BinaryNode<Rank, InDtype, OutDtype> { public: - OpMul(TosaAttributeBase* attribute_, TosaQuantInfoBase* qinfo_, uint64_t id_) - : BinaryNode<Rank, InDtype, OutDtype>(Op_MUL, qinfo_, id_) + OpMul(SubgraphTraverser* sgt_, TosaAttributeBase* attribute_, TosaQuantInfoBase* qinfo_, uint64_t id_) + : BinaryNode<Rank, InDtype, OutDtype>(sgt_, Op_MUL, qinfo_, id_) { INIT_ATTRIBUTE(Mul); register_fcn(); @@ -180,7 +183,7 @@ template <int Rank, DType InDtype> class OpTable : public GraphNode { public: - OpTable(TosaAttributeBase* attribute_, TosaQuantInfoBase* qinfo_, uint64_t id_); + OpTable(SubgraphTraverser* sgt_, TosaAttributeBase* attribute_, TosaQuantInfoBase* qinfo_, uint64_t id_); virtual ~OpTable(); virtual int checkTensorAttributes(); |