From af2662496e75d847909c56b9bfff452e103041fe Mon Sep 17 00:00:00 2001 From: Taichi Gardener Date: Tue, 20 Jul 2021 06:25:11 +0000 Subject: [PATCH] Auto Format --- taichi/codegen/codegen_llvm.cpp | 11 ++++++----- taichi/struct/struct.cpp | 3 ++- taichi/transforms/lower_access.cpp | 14 ++++++++------ .../cpp/transforms/scalar_pointer_lowerer_test.cpp | 4 +++- tests/python/test_packed_size.py | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/taichi/codegen/codegen_llvm.cpp b/taichi/codegen/codegen_llvm.cpp index e4a11d9e7..3e1bd8c05 100644 --- a/taichi/codegen/codegen_llvm.cpp +++ b/taichi/codegen/codegen_llvm.cpp @@ -1676,13 +1676,14 @@ void CodeGenLLVM::create_offload_struct_for(OffloadedStmt *stmt, bool spmd) { if (!prog->config.packed) { for (int i = 0; i < snode->num_active_indices; i++) { auto j = snode->physical_index_position[i]; - if (!bit::is_power_of_two(snode->extractors[j].num_elements_from_root)) { + if (!bit::is_power_of_two( + snode->extractors[j].num_elements_from_root)) { auto coord = coord_object.get("val", tlctx->get_constant(j)); exec_cond = builder->CreateAnd( - exec_cond, - builder->CreateICmp( - llvm::CmpInst::ICMP_SLT, coord, - tlctx->get_constant(snode->extractors[j].num_elements_from_root))); + exec_cond, builder->CreateICmp( + llvm::CmpInst::ICMP_SLT, coord, + tlctx->get_constant( + snode->extractors[j].num_elements_from_root))); } } } diff --git a/taichi/struct/struct.cpp b/taichi/struct/struct.cpp index bfba1c013..d4b8355e7 100644 --- a/taichi/struct/struct.cpp +++ b/taichi/struct/struct.cpp @@ -14,7 +14,8 @@ void infer_snode_properties(SNode &snode, bool packed) { auto &ch = snode.ch[ch_id]; ch->parent = &snode; for (int i = 0; i < taichi_max_num_indices; i++) { - ch->extractors[i].num_elements_from_root *= snode.extractors[i].num_elements_from_root; + ch->extractors[i].num_elements_from_root *= + snode.extractors[i].num_elements_from_root; bool found = false; for (int k = 0; k < taichi_max_num_indices; k++) { if (snode.physical_index_position[k] == i) { diff --git a/taichi/transforms/lower_access.cpp b/taichi/transforms/lower_access.cpp index 35f5c3adb..c2c44562a 100644 --- a/taichi/transforms/lower_access.cpp +++ b/taichi/transforms/lower_access.cpp @@ -49,9 +49,11 @@ class LowerAccess : public IRVisitor { bool packed; LowerAccess(const std::vector &kernel_forces_no_activate, - bool lower_atomic_ptr, bool packed) + bool lower_atomic_ptr, + bool packed) : kernel_forces_no_activate(kernel_forces_no_activate), - lower_atomic_ptr(lower_atomic_ptr), packed(packed) { + lower_atomic_ptr(lower_atomic_ptr), + packed(packed) { // TODO: change this to false allow_undefined_visitor = true; current_struct_for = nullptr; @@ -100,8 +102,8 @@ class LowerAccess : public IRVisitor { TI_ASSERT(!pointer_needs_activation); } - PtrLowererImpl lowerer{leaf_snode, indices, snode_op, is_bit_vectorized, - lowered, packed}; + PtrLowererImpl lowerer{leaf_snode, indices, snode_op, + is_bit_vectorized, lowered, packed}; lowerer.set_pointer_needs_activation(pointer_needs_activation); lowerer.set_lower_access(this); lowerer.run(); @@ -305,8 +307,8 @@ namespace irpass { bool lower_access(IRNode *root, const CompileConfig &config, const LowerAccessPass::Args &args) { - bool modified = - LowerAccess::run(root, args.kernel_forces_no_activate, args.lower_atomic, config.packed); + bool modified = LowerAccess::run(root, args.kernel_forces_no_activate, + args.lower_atomic, config.packed); type_check(root, config); return modified; } diff --git a/tests/cpp/transforms/scalar_pointer_lowerer_test.cpp b/tests/cpp/transforms/scalar_pointer_lowerer_test.cpp index fd9b8d6e3..9a5d3a87e 100644 --- a/tests/cpp/transforms/scalar_pointer_lowerer_test.cpp +++ b/tests/cpp/transforms/scalar_pointer_lowerer_test.cpp @@ -62,7 +62,9 @@ TEST_F(ScalarPointerLowererTest, Basic) { LowererImpl lowerer{leaf_snode_, std::vector{builder.get_int32(loop_index)}, SNodeOpType::undefined, - /*is_bit_vectorized=*/false, &lowered, /*packed=*/false}; + /*is_bit_vectorized=*/false, + &lowered, + /*packed=*/false}; lowerer.run(); // There are three linearized stmts: // 0: for root diff --git a/tests/python/test_packed_size.py b/tests/python/test_packed_size.py index 695f894bc..19837ec4f 100644 --- a/tests/python/test_packed_size.py +++ b/tests/python/test_packed_size.py @@ -5,4 +5,4 @@ def test_packed_size(): x = ti.field(ti.i32) ti.root.dense(ti.i, 20).dense(ti.ijk, 334).place(x) - assert x.snode.parent().parent().cell_size_bytes == 4 * 334 ** 3 + assert x.snode.parent().parent().cell_size_bytes == 4 * 334**3