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/op_factory.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/op_factory.h')
| -rw-r--r-- | reference_model/src/ops/op_factory.h | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/reference_model/src/ops/op_factory.h b/reference_model/src/ops/op_factory.h index 0c116b6..eaa359c 100644 --- a/reference_model/src/ops/op_factory.h +++ b/reference_model/src/ops/op_factory.h @@ -24,55 +24,55 @@ #define DEF_FACTORY_ONE_RANK_ONE_TYPE(OP, RANK, DTYPE) \ case RANK: \ - return new OP<RANK, DType_##DTYPE>(attribute, qinfo, id); + return new OP<RANK, DType_##DTYPE>(sgt, attribute, qinfo, id); #define DEF_FACTORY_ONE_RANK_TWO_TYPE(OP, RANK, DTYPE1, DTYPE2) \ case RANK: \ - return new OP<RANK, DType_##DTYPE1, DType_##DTYPE2>(attribute, qinfo, id); + return new OP<RANK, DType_##DTYPE1, DType_##DTYPE2>(sgt, attribute, qinfo, id); #define DEF_FACTORY_TWO_RANK_ONE_TYPE(OP, RANK1, RANK2, DTYPE) \ case RANK2: \ - return new OP<RANK1, RANK2, DType_##DTYPE>(attribute, qinfo, id); + return new OP<RANK1, RANK2, DType_##DTYPE>(sgt, attribute, qinfo, id); #define DEF_FACTORY_TWO_RANK_TWO_TYPE(OP, RANK1, RANK2, DTYPE1, DTYPE2) \ case RANK2: \ - return new OP<RANK1, RANK2, DType_##DTYPE1, DType_##DTYPE2>(attribute, qinfo, id); + return new OP<RANK1, RANK2, DType_##DTYPE1, DType_##DTYPE2>(sgt, attribute, qinfo, id); #define DEF_FACTORY_ONE_RANK_0_6(OP) \ switch (inputRank) \ { \ case 0: \ - return new OP<0>(attribute, qinfo, id); \ + return new OP<0>(sgt, attribute, qinfo, id); \ case 1: \ - return new OP<1>(attribute, qinfo, id); \ + return new OP<1>(sgt, attribute, qinfo, id); \ case 2: \ - return new OP<2>(attribute, qinfo, id); \ + return new OP<2>(sgt, attribute, qinfo, id); \ case 3: \ - return new OP<3>(attribute, qinfo, id); \ + return new OP<3>(sgt, attribute, qinfo, id); \ case 4: \ - return new OP<4>(attribute, qinfo, id); \ + return new OP<4>(sgt, attribute, qinfo, id); \ case 5: \ - return new OP<5>(attribute, qinfo, id); \ + return new OP<5>(sgt, attribute, qinfo, id); \ case 6: \ - return new OP<6>(attribute, qinfo, id); \ + return new OP<6>(sgt, attribute, qinfo, id); \ } #define DEF_FACTORY_ONE_TYPE(OP, DTYPE) \ if (inputDType == DType_##DTYPE) \ { \ - return new OP<DType_##DTYPE>(attribute, qinfo, id); \ + return new OP<DType_##DTYPE>(sgt, attribute, qinfo, id); \ } #define DEF_FACTORY_TWO_TYPE(OP, DTYPE1, DTYPE2) \ if (inputDType == DType_##DTYPE1 && weightDType == DType_##DTYPE2) \ { \ - return new OP<DType_##DTYPE1, DType_##DTYPE2>(attribute, qinfo, id); \ + return new OP<DType_##DTYPE1, DType_##DTYPE2>(sgt, attribute, qinfo, id); \ } #define DEF_FACTORY_TWO_TYPE_RESIZE(OP, DTYPE1, DTYPE2) \ if (inputDType == DType_##DTYPE1 && outputDType == DType_##DTYPE2) \ { \ - return new OP<DType_##DTYPE1, DType_##DTYPE2>(attribute, qinfo, id); \ + return new OP<DType_##DTYPE1, DType_##DTYPE2>(sgt, attribute, qinfo, id); \ } #define DEF_FACTORY_RANK0_6_ONE_RANK_ONE_TYPE(OP, DTYPE) \ @@ -221,10 +221,14 @@ namespace TosaReference { +class SubgraphTraverser; +class GraphNode; + class OpFactory { public: - static GraphNode* newOp(tosa::TosaSerializationHandler* tsh, + static GraphNode* newOp(SubgraphTraverser* sgt, + tosa::TosaSerializationHandler* tsh, tosa::Op opType, tosa::TosaAttributeBase* attribute, tosa::TosaQuantInfoBase* qinfo, |