From 904a79f99153d9d8ed67beeed82a0f910bb000fd Mon Sep 17 00:00:00 2001 From: eopXD Date: Sun, 25 Dec 2022 07:38:01 -0800 Subject: [PATCH] [NFC][Clang][RISCV] Reduce for-loop with SmallVector utility As topic, this commit reduces the for-loops with utilities of SmallVector. Reviewed By: craig.topper Differential Revision: https://reviews.llvm.org/D140661 --- clang/include/clang/Basic/riscv_vector.td | 24 ++++++++---------------- clang/lib/Support/RISCVVIntrinsicUtils.cpp | 6 ++---- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/clang/include/clang/Basic/riscv_vector.td b/clang/include/clang/Basic/riscv_vector.td index 7dbd331..1ed8e00 100644 --- a/clang/include/clang/Basic/riscv_vector.td +++ b/clang/include/clang/Basic/riscv_vector.td @@ -848,8 +848,7 @@ multiclass RVVUnitStridedSegLoad { // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, vl) // intrinsic: (maskedoff0, ..., ptr, mask, vl) if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) { - for (unsigned I = 0; I < NF; ++I) - Operands.push_back(llvm::PoisonValue::get(ResultType)); + Operands.append(NF, llvm::PoisonValue::get(ResultType)); Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF + 2]); @@ -867,8 +866,7 @@ multiclass RVVUnitStridedSegLoad { // TU builtin: (val0 address, ..., passthru0, ..., ptr, vl) // intrinsic: (passthru0, passthru1, ..., ptr, vl) if (DefaultPolicy == TAIL_AGNOSTIC) { - for (unsigned I = 0; I < NF; ++I) - Operands.push_back(llvm::PoisonValue::get(ResultType)); + Operands.append(NF, llvm::PoisonValue::get(ResultType)); Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF + 1]); } else { @@ -927,8 +925,7 @@ multiclass RVVUnitStridedSegLoadFF { // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, new_vl, vl) // intrinsic: (maskedoff0, ..., ptr, mask, vl) if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) { - for (unsigned I = 0; I < NF; ++I) - Operands.push_back(llvm::PoisonValue::get(ResultType)); + Operands.append(NF, llvm::PoisonValue::get(ResultType)); Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF + 3]); @@ -948,8 +945,7 @@ multiclass RVVUnitStridedSegLoadFF { // TU builtin: (val0 address, ..., passthru0, ..., ptr, new_vl, vl) // intrinsic: (passthru0, passthru1, ..., ptr, vl) if (DefaultPolicy == TAIL_AGNOSTIC) { - for (unsigned I = 0; I < NF; ++I) - Operands.push_back(llvm::PoisonValue::get(ResultType)); + Operands.append(NF, llvm::PoisonValue::get(ResultType)); Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF + 2]); NewVL = Ops[NF + 1]; @@ -1010,8 +1006,7 @@ multiclass RVVStridedSegLoad { // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, stride, vl) // intrinsic: (maskedoff0, ..., ptr, stride, mask, vl) if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) { - for (unsigned I = 0; I < NF; ++I) - Operands.push_back(llvm::PoisonValue::get(ResultType)); + Operands.append(NF, llvm::PoisonValue::get(ResultType)); Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 2]); Operands.push_back(Ops[NF]); @@ -1031,8 +1026,7 @@ multiclass RVVStridedSegLoad { // TU builtin: (val0 address, ..., passthru0, ..., ptr, stride, vl) // intrinsic: (passthru0, passthru1, ..., ptr, stride, vl) if (DefaultPolicy == TAIL_AGNOSTIC) { - for (unsigned I = 0; I < NF; ++I) - Operands.push_back(llvm::PoisonValue::get(ResultType)); + Operands.append(NF, llvm::PoisonValue::get(ResultType)); Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 2]); @@ -1086,8 +1080,7 @@ multiclass RVVIndexedSegLoad { // builtin: (val0 address, ..., mask, maskedoff0, ..., ptr, index, vl) // intrinsic: (maskedoff0, ..., ptr, index, mask, vl) if (DefaultPolicy == TAIL_AGNOSTIC_MASK_AGNOSTIC) { - for (unsigned I = 0; I < NF; ++I) - Operands.push_back(llvm::PoisonValue::get(ResultType)); + Operands.append(NF, llvm::PoisonValue::get(ResultType)); Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 2]); Operands.push_back(Ops[NF]); @@ -1109,8 +1102,7 @@ multiclass RVVIndexedSegLoad { // TU builtin: (val0 address, ..., passthru0, ..., ptr, index, vl) // intrinsic: (passthru0, passthru1, ..., ptr, index, vl) if (DefaultPolicy == TAIL_AGNOSTIC) { - for (unsigned I = 0; I < NF; ++I) - Operands.push_back(llvm::PoisonValue::get(ResultType)); + Operands.append(NF, llvm::PoisonValue::get(ResultType)); Operands.push_back(Ops[NF]); Operands.push_back(Ops[NF + 1]); Operands.push_back(Ops[NF + 2]); diff --git a/clang/lib/Support/RISCVVIntrinsicUtils.cpp b/clang/lib/Support/RISCVVIntrinsicUtils.cpp index d9feec8..bd05dad 100644 --- a/clang/lib/Support/RISCVVIntrinsicUtils.cpp +++ b/clang/lib/Support/RISCVVIntrinsicUtils.cpp @@ -939,8 +939,7 @@ llvm::SmallVector RVVIntrinsic::computeBuiltinTypes( // (void, op0 address, op1 address, ..., maskedoff0, maskedoff1, ...) PrototypeDescriptor MaskoffType = NewPrototype[1]; MaskoffType.TM &= ~static_cast(TypeModifier::Pointer); - for (unsigned I = 0; I < NF; ++I) - NewPrototype.insert(NewPrototype.begin() + NF + 1, MaskoffType); + NewPrototype.insert(NewPrototype.begin() + NF + 1, NF, MaskoffType); } } // Erase passthru operand for TAM @@ -983,8 +982,7 @@ llvm::SmallVector RVVIntrinsic::computeBuiltinTypes( // (void, op0 address, op1 address, maskedoff0, maskedoff1, ...) PrototypeDescriptor MaskoffType = Prototype[1]; MaskoffType.TM &= ~static_cast(TypeModifier::Pointer); - for (unsigned I = 0; I < NF; ++I) - NewPrototype.insert(NewPrototype.begin() + NF + 1, MaskoffType); + NewPrototype.insert(NewPrototype.begin() + NF + 1, NF, MaskoffType); } } -- 2.7.4