From 4468bcd651bab53776be7a10e00f21e49a0697a8 Mon Sep 17 00:00:00 2001 From: anakinxc Date: Fri, 12 Jan 2024 15:10:53 +0800 Subject: [PATCH] repo-sync-2024-01-12T15:10:44+0800 --- libspu/compiler/tests/enum_conversion_test.cc | 3 ++- libspu/mpc/ab_api_test.cc | 20 +++++++++---------- libspu/mpc/utils/ring_ops.cc | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libspu/compiler/tests/enum_conversion_test.cc b/libspu/compiler/tests/enum_conversion_test.cc index 889110a5..8a41d105 100644 --- a/libspu/compiler/tests/enum_conversion_test.cc +++ b/libspu/compiler/tests/enum_conversion_test.cc @@ -29,7 +29,8 @@ TEST(EnumConversion, Public) { mlir::pphlo::symbolizeEnum(Visibility_Name(v)); \ EXPECT_EQ(mlir_v, mlir::pphlo::Visibility::T); - {CHECK(VIS_PUBLIC)} { CHECK(VIS_SECRET) } + { CHECK(VIS_PUBLIC) } + { CHECK(VIS_SECRET) } #undef CHECK } diff --git a/libspu/mpc/ab_api_test.cc b/libspu/mpc/ab_api_test.cc index ac966fa9..ed031921 100644 --- a/libspu/mpc/ab_api_test.cc +++ b/libspu/mpc/ab_api_test.cc @@ -101,10 +101,10 @@ bool verifyCost(Kernel* kernel, std::string_view name, FieldType field, /* WHEN */ \ auto a0 = p2a(obj.get(), p0); \ auto a1 = p2a(obj.get(), p1); \ - auto prev = obj->prot()->getState()->getStats(); \ + auto prev = obj->prot() -> getState() -> getStats(); \ auto tmp = OP##_aa(obj.get(), a0, a1); \ auto cost = \ - obj->prot()->getState()->getStats() - prev; \ + obj->prot() -> getState() -> getStats() - prev; \ auto re = a2p(obj.get(), tmp); \ auto rp = OP##_pp(obj.get(), p0, p1); \ \ @@ -131,10 +131,10 @@ bool verifyCost(Kernel* kernel, std::string_view name, FieldType field, \ /* WHEN */ \ auto a0 = p2a(obj.get(), p0); \ - auto prev = obj->prot()->getState()->getStats(); \ + auto prev = obj->prot() -> getState() -> getStats(); \ auto tmp = OP##_ap(obj.get(), a0, p1); \ auto cost = \ - obj->prot()->getState()->getStats() - prev; \ + obj->prot() -> getState() -> getStats() - prev; \ auto re = a2p(obj.get(), tmp); \ auto rp = OP##_pp(obj.get(), p0, p1); \ \ @@ -480,10 +480,10 @@ TEST_P(ArithmeticTest, A2P) { /* WHEN */ \ auto b0 = p2b(obj.get(), p0); \ auto b1 = p2b(obj.get(), p1); \ - auto prev = obj->prot()->getState()->getStats(); \ + auto prev = obj->prot() -> getState() -> getStats(); \ auto tmp = OP##_bb(obj.get(), b0, b1); \ auto cost = \ - obj->prot()->getState()->getStats() - prev; \ + obj->prot() -> getState() -> getStats() - prev; \ auto re = b2p(obj.get(), tmp); \ auto rp = OP##_pp(obj.get(), p0, p1); \ \ @@ -510,10 +510,10 @@ TEST_P(ArithmeticTest, A2P) { \ /* WHEN */ \ auto b0 = p2b(obj.get(), p0); \ - auto prev = obj->prot()->getState()->getStats(); \ + auto prev = obj->prot() -> getState() -> getStats(); \ auto tmp = OP##_bp(obj.get(), b0, p1); \ auto cost = \ - obj->prot()->getState()->getStats() - prev; \ + obj->prot() -> getState() -> getStats() - prev; \ auto re = b2p(obj.get(), tmp); \ auto rp = OP##_pp(obj.get(), p0, p1); \ \ @@ -550,10 +550,10 @@ TEST_BOOLEAN_BINARY_OP(xor) continue; \ } \ /* WHEN */ \ - auto prev = obj->prot()->getState()->getStats(); \ + auto prev = obj->prot() -> getState() -> getStats(); \ auto tmp = OP##_b(obj.get(), b0, bits); \ auto cost = \ - obj->prot()->getState()->getStats() - prev; \ + obj->prot() -> getState() -> getStats() - prev; \ auto r_b = b2p(obj.get(), tmp); \ auto r_p = OP##_p(obj.get(), p0, bits); \ \ diff --git a/libspu/mpc/utils/ring_ops.cc b/libspu/mpc/utils/ring_ops.cc index cc87f7c5..fccd0292 100644 --- a/libspu/mpc/utils/ring_ops.cc +++ b/libspu/mpc/utils/ring_ops.cc @@ -45,7 +45,7 @@ constexpr char kModule[] = "RingOps"; #define DEF_UNARY_RING_OP(NAME, OP) \ void NAME##_impl(NdArrayRef& ret, const NdArrayRef& x) { \ ENFORCE_EQ_ELSIZE_AND_SHAPE(ret, x); \ - const auto field = x.eltype().as()->field(); \ + const auto field = x.eltype().as() -> field(); \ const int64_t numel = ret.numel(); \ return DISPATCH_ALL_FIELDS(field, kModule, [&]() { \ using T = std::make_signed_t; \ @@ -65,7 +65,7 @@ DEF_UNARY_RING_OP(ring_neg, -); const NdArrayRef& y) { \ ENFORCE_EQ_ELSIZE_AND_SHAPE(ret, x); \ ENFORCE_EQ_ELSIZE_AND_SHAPE(ret, y); \ - const auto field = x.eltype().as()->field(); \ + const auto field = x.eltype().as() -> field(); \ const int64_t numel = ret.numel(); \ return DISPATCH_ALL_FIELDS(field, kModule, [&]() { \ NdArrayView _x(x); \