Author: Amr Hesham Date: 2026-03-06T19:11:33+01:00 New Revision: f305da7240b607141af69644eabbef4794005a96
URL: https://github.com/llvm/llvm-project/commit/f305da7240b607141af69644eabbef4794005a96 DIFF: https://github.com/llvm/llvm-project/commit/f305da7240b607141af69644eabbef4794005a96.diff LOG: [CIR] Implement PackIndexingExpr for ComplexType (#184878) Implement the PackIndexingExpr for ComplexType Added: Modified: clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp clang/test/CIR/CodeGen/pack-indexing.cpp Removed: ################################################################################ diff --git a/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp b/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp index 3a9f68ece29c9..aa59e7f2bf8e2 100644 --- a/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp +++ b/clang/lib/CIR/CodeGen/CIRGenExprComplex.cpp @@ -328,9 +328,7 @@ class ComplexExprEmitter : public StmtVisitor<ComplexExprEmitter, mlir::Value> { } mlir::Value VisitPackIndexingExpr(PackIndexingExpr *e) { - cgf.cgm.errorNYI(e->getExprLoc(), - "ComplexExprEmitter VisitPackIndexingExpr"); - return {}; + return Visit(e->getSelectedExpr()); } }; } // namespace diff --git a/clang/test/CIR/CodeGen/pack-indexing.cpp b/clang/test/CIR/CodeGen/pack-indexing.cpp index b90178b727df9..37ecb1f10bf1d 100644 --- a/clang/test/CIR/CodeGen/pack-indexing.cpp +++ b/clang/test/CIR/CodeGen/pack-indexing.cpp @@ -5,7 +5,7 @@ // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++2c -emit-llvm %s -o %t.ll // RUN: FileCheck --input-file=%t.ll %s -check-prefix=OGCG -int pack_indexing(auto... p) { return p...[0]; } +auto pack_indexing(auto... p) { return p...[0]; } // CIR: %[[P_0:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["p", init] // CIR: %[[P_1:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["p", init] @@ -31,19 +31,83 @@ int pack_indexing(auto... p) { return p...[0]; } // OGCG-DAG: %[[RESULT:.*]] = load i32, ptr %[[P_0]], align 4 // OGCG-DAG-NEXT: ret i32 %[[RESULT]] -int foo() { return pack_indexing(1, 2, 3); } +int pack_indexing_scalar() { return pack_indexing(1, 2, 3); } // CIR: %[[RET_VAL:.*]] = cir.alloca !s32i, !cir.ptr<!s32i>, ["__retval"] -// CIR: %[[RESULT:.*]] = cir.call @_Z13pack_indexingIJiiiEEiDpT_({{.*}}, {{.*}}, {{.*}}) : (!s32i {llvm.noundef}, !s32i {llvm.noundef}, !s32i {llvm.noundef}) -> (!s32i {llvm.noundef}) +// CIR: %[[RESULT:.*]] = cir.call @_Z13pack_indexingIJiiiEEDaDpT_({{.*}}, {{.*}}, {{.*}}) : (!s32i {llvm.noundef}, !s32i {llvm.noundef}, !s32i {llvm.noundef}) -> (!s32i {llvm.noundef}) // CIR: cir.store %[[RESULT]], %[[RET_VAL]] : !s32i, !cir.ptr<!s32i> // CIR: %[[TMP:.*]] = cir.load %[[RET_VAL]] : !cir.ptr<!s32i>, !s32i // CIR: cir.return %[[TMP]] : !s32i // LLVM: %[[RET_VAL:.*]] = alloca i32, i64 1, align 4 -// LLVM: %[[RESULT:.*]] = call noundef i32 @_Z13pack_indexingIJiiiEEiDpT_(i32 noundef 1, i32 noundef 2, i32 noundef 3) +// LLVM: %[[RESULT:.*]] = call noundef i32 @_Z13pack_indexingIJiiiEEDaDpT_(i32 noundef 1, i32 noundef 2, i32 noundef 3) // LLVM: store i32 %[[RESULT]], ptr %[[RET_VAL]], align 4 // LLVM: %[[TMP:.*]] = load i32, ptr %[[RET_VAL]], align 4 // LLVM: ret i32 %[[TMP]] -// OGCG-DAG: %[[CALL:.*]] = call noundef i32 @_Z13pack_indexingIJiiiEEiDpT_(i32 noundef 1, i32 noundef 2, i32 noundef 3) +// OGCG-DAG: %[[CALL:.*]] = call noundef i32 @_Z13pack_indexingIJiiiEEDaDpT_(i32 noundef 1, i32 noundef 2, i32 noundef 3) // OGCG-DAG-NEXT: ret i32 %[[RESULT]] + +float _Complex pack_indexing_complex() { + return pack_indexing(__builtin_complex(1.0f, 2.0f), + __builtin_complex(3.0f, 4.0f)); +} + +// CIR: cir.func {{.*}} @_Z21pack_indexing_complexv() +// CIR: %[[RET_VAL:.*]] = cir.alloca !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>>, ["__retval"] +// CIR: %[[COMPLEX_0:.*]] = cir.alloca !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>>, ["coerce"] +// CIR: %[[COMPLEX_1:.*]] = cir.alloca !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>>, ["coerce"] +// CIR: %[[CONST_COMPLEX_0:.*]] = cir.const #cir.const_complex<#cir.fp<1.000000e+00> : !cir.float, #cir.fp<2.000000e+00> : !cir.float> : !cir.complex<!cir.float> +// CIR: %[[CONST_COMPLEX_1:.*]] = cir.const #cir.const_complex<#cir.fp<3.000000e+00> : !cir.float, #cir.fp<4.000000e+00> : !cir.float> : !cir.complex<!cir.float> +// CIR: cir.store {{.*}} %[[CONST_COMPLEX_0]], %[[COMPLEX_0]] : !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>> +// CIR: %[[TMP_COMPLEX_0:.*]] = cir.load {{.*}} %[[COMPLEX_0]] : !cir.ptr<!cir.complex<!cir.float>>, !cir.complex<!cir.float> +// CIR: cir.store {{.*}} %[[CONST_COMPLEX_1]], %[[COMPLEX_1]] : !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>> +// CIR: %[[TMP_COMPLEX_1:.*]] = cir.load {{.*}} %[[COMPLEX_1]] : !cir.ptr<!cir.complex<!cir.float>>, !cir.complex<!cir.float> +// CIR: %[[RESULT:.*]] = cir.call @_Z13pack_indexingIJCfS0_EEDaDpT_(%[[TMP_COMPLEX_0]], %[[TMP_COMPLEX_1]]) : (!cir.complex<!cir.float> {llvm.noundef}, !cir.complex<!cir.float> {llvm.noundef}) -> (!cir.complex<!cir.float> {llvm.noundef}) +// CIR: cir.store {{.*}} %[[RESULT]], %[[RET_VAL]] : !cir.complex<!cir.float>, !cir.ptr<!cir.complex<!cir.float>> +// CIR: %[[TMP_RET:.*]] = cir.load %[[RET_VAL]] : !cir.ptr<!cir.complex<!cir.float>>, !cir.complex<!cir.float> +// CIR: cir.return %[[TMP_RET]] : !cir.complex<!cir.float> + +// LLVM: define {{.*}} { float, float } @_Z21pack_indexing_complexv() +// LLVM: %[[RET_VAL:.*]] = alloca { float, float }, i64 1, align 4 +// LLVM: %[[COMPLEX_0:.*]] = alloca { float, float }, i64 1, align 4 +// LLVM: %[[COMPLEX_1:.*]] = alloca { float, float }, i64 1, align 4 +// LLVM: store { float, float } { float 1.000000e+00, float 2.000000e+00 }, ptr %[[COMPLEX_0]], align 4 +// LLVM: %[[TMP_COMPLEX_0:.*]] = load { float, float }, ptr %[[COMPLEX_0]], align 4 +// LLVM: store { float, float } { float 3.000000e+00, float 4.000000e+00 }, ptr %[[COMPLEX_1]], align 4 +// LLVM: %[[TMP_COMPLEX_1:.*]] = load { float, float }, ptr %[[COMPLEX_1]], align 4 +// LLVM: %[[RESULT:.*]] = call noundef { float, float } @_Z13pack_indexingIJCfS0_EEDaDpT_({ float, float } {{.*}} %[[TMP_COMPLEX_0]], { float, float } {{.*}} %[[TMP_COMPLEX_1]]) +// LLVM: store { float, float } %[[RESULT]], ptr %[[RET_VAL]], align 4 +// LLVM: %[[TMP_RET:.*]] = load { float, float }, ptr %[[RET_VAL]], align 4 +// LLVM: ret { float, float } %[[TMP_RET]] + +// TODO(CIR): the diff erence between the CIR LLVM and OGCG is because the lack of calling convention lowering, +// Test will be updated when that is implemented + +// OGCG: define {{.*}} <2 x float> @_Z21pack_indexing_complexv() +// OGCG: %[[RET_VAL:.*]] = alloca { float, float }, align 4 +// OGCG: %[[COMPLEX_0:.*]] = alloca { float, float }, align 4 +// OGCG: %[[COMPLEX_1:.*]] = alloca { float, float }, align 4 +// OGCG: %[[RESULT_ADDR:.*]] = alloca { float, float }, align 4 +// OGCG: %[[COMPLEX_0_REAL_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[COMPLEX_0]], i32 0, i32 0 +// OGCG: %[[COMPLEX_0_IMAG_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[COMPLEX_0]], i32 0, i32 1 +// OGCG: store float 1.000000e+00, ptr %[[COMPLEX_0_REAL_PTR]], align 4 +// OGCG: store float 2.000000e+00, ptr %[[COMPLEX_0_IMAG_PTR]], align 4 +// OGCG: %[[TMP_COMPLEX_0:.*]] = load <2 x float>, ptr %[[COMPLEX_0]], align 4 +// OGCG: %[[COMPLEX_1_REAL_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[COMPLEX_1]], i32 0, i32 0 +// OGCG: %[[COMPLEX_1_IMAG_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[COMPLEX_1]], i32 0, i32 1 +// OGCG: store float 3.000000e+00, ptr %[[COMPLEX_1_REAL_PTR]], align 4 +// OGCG: store float 4.000000e+00, ptr %[[COMPLEX_1_IMAG_PTR]], align 4 +// OGCG: %[[TMP_COMPLEX_1:.*]] = load <2 x float>, ptr %[[COMPLEX_1]], align 4 +// OGCG: %[[RESULT:.*]] = call noundef <2 x float> @_Z13pack_indexingIJCfS0_EEDaDpT_(<2 x float> noundef %[[TMP_COMPLEX_0]], <2 x float> noundef %[[TMP_COMPLEX_1]]) +// OGCG: store <2 x float> %[[RESULT]], ptr %[[RESULT_ADDR]], align 4 +// OGCG: %[[RESULT_REAL_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[RESULT_ADDR]], i32 0, i32 0 +// OGCG: %[[RESULT_REAL:.*]] = load float, ptr %[[RESULT_REAL_PTR]], align 4 +// OGCG: %[[RESULT_IMAG_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[RESULT_ADDR]], i32 0, i32 1 +// OGCG: %[[RESULT_IMAG:.*]] = load float, ptr %[[RESULT_IMAG_PTR]], align 4 +// OGCG: %[[RET_REAL_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[RET_VAL]], i32 0, i32 0 +// OGCG: %[[RET_IMAG_PTR:.*]] = getelementptr inbounds nuw { float, float }, ptr %[[RET_VAL]], i32 0, i32 1 +// OGCG: store float %[[RESULT_REAL]], ptr %[[RET_REAL_PTR]], align 4 +// OGCG: store float %[[RESULT_IMAG]], ptr %[[RET_IMAG_PTR]], align 4 +// OGCG: %[[TMP_RET:.*]] = load <2 x float>, ptr %[[RET_VAL]], align 4 +// OGCG: ret <2 x float> %[[TMP_RET]] _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
