[PATCH] D38820: [CGExprScalar] Add missing types in function GetIntrinsic
This revision was automatically updated to reflect the committed changes. Closed by commit rL316179: [CGExprScalar] Add missing types in function GetIntrinsic (authored by Carrot). Changed prior to commit: https://reviews.llvm.org/D38820?vs=118680&id=119613#toc Repository: rL LLVM https://reviews.llvm.org/D38820 Files: cfe/trunk/lib/CodeGen/CGExprScalar.cpp cfe/trunk/test/CodeGen/ppc-vector-compare.cc Index: cfe/trunk/lib/CodeGen/CGExprScalar.cpp === --- cfe/trunk/lib/CodeGen/CGExprScalar.cpp +++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp @@ -3120,16 +3120,25 @@ return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequh_p : llvm::Intrinsic::ppc_altivec_vcmpgtsh_p; case BuiltinType::UInt: - case BuiltinType::ULong: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequw_p : llvm::Intrinsic::ppc_altivec_vcmpgtuw_p; case BuiltinType::Int: - case BuiltinType::Long: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequw_p : llvm::Intrinsic::ppc_altivec_vcmpgtsw_p; + case BuiltinType::ULong: + case BuiltinType::ULongLong: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequd_p : +llvm::Intrinsic::ppc_altivec_vcmpgtud_p; + case BuiltinType::Long: + case BuiltinType::LongLong: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequd_p : +llvm::Intrinsic::ppc_altivec_vcmpgtsd_p; case BuiltinType::Float: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpeqfp_p : llvm::Intrinsic::ppc_altivec_vcmpgtfp_p; + case BuiltinType::Double: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_vsx_xvcmpeqdp_p : +llvm::Intrinsic::ppc_vsx_xvcmpgtdp_p; } } Index: cfe/trunk/test/CodeGen/ppc-vector-compare.cc === --- cfe/trunk/test/CodeGen/ppc-vector-compare.cc +++ cfe/trunk/test/CodeGen/ppc-vector-compare.cc @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -target-feature +altivec -triple powerpc64-unknown-unknown -emit-llvm %s \ +// RUN: %clang_cc1 -target-feature +vsx -triple powerpc64-unknown-unknown -emit-llvm %s \ // RUN:-o - | FileCheck %s #include @@ -9,3 +9,26 @@ return v1 == v2; } +// CHECK-LABEL: @_Z5test2Dv2_mS_Dv2_lS0_Dv2_yS1_Dv2_xS2_Dv2_dS3_ +bool test2(vector unsigned long v1, vector unsigned long v2, + vector long v3, vector long v4, + vector unsigned long long v5, vector unsigned long long v6, + vector long long v7, vector long long v8, + vector double v9, vector double v10) { + // CHECK: @llvm.ppc.altivec.vcmpequd.p + bool res = v1 == v2; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v3 == v4; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v5 == v6; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v7 == v8; + + // CHECK: @llvm.ppc.vsx.xvcmpeqdp.p + res |= v9 == v10; + return res; +} + Index: cfe/trunk/lib/CodeGen/CGExprScalar.cpp === --- cfe/trunk/lib/CodeGen/CGExprScalar.cpp +++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp @@ -3120,16 +3120,25 @@ return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequh_p : llvm::Intrinsic::ppc_altivec_vcmpgtsh_p; case BuiltinType::UInt: - case BuiltinType::ULong: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequw_p : llvm::Intrinsic::ppc_altivec_vcmpgtuw_p; case BuiltinType::Int: - case BuiltinType::Long: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequw_p : llvm::Intrinsic::ppc_altivec_vcmpgtsw_p; + case BuiltinType::ULong: + case BuiltinType::ULongLong: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequd_p : +llvm::Intrinsic::ppc_altivec_vcmpgtud_p; + case BuiltinType::Long: + case BuiltinType::LongLong: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequd_p : +llvm::Intrinsic::ppc_altivec_vcmpgtsd_p; case BuiltinType::Float: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpeqfp_p : llvm::Intrinsic::ppc_altivec_vcmpgtfp_p; + case BuiltinType::Double: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_vsx_xvcmpeqdp_p : +llvm::Intrinsic::ppc_vsx_xvcmpgtdp_p; } } Index: cfe/trunk/test/CodeGen/ppc-vector-compare.cc === --- cfe/trunk/test/CodeGen/ppc-vector-compare.cc +++ cfe/trunk/test/CodeGen/ppc-vector-compare.cc @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -target-feature +altivec -triple powerpc64-unknown-unknown -emit-llvm %s \ +// RUN: %clang_cc1 -target-feature +vsx -trip
[PATCH] D38820: [CGExprScalar] Add missing types in function GetIntrinsic
nemanjai accepted this revision. nemanjai added a comment. This revision is now accepted and ready to land. LGTM. https://reviews.llvm.org/D38820 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D38820: [CGExprScalar] Add missing types in function GetIntrinsic
Carrot added a comment. ping https://reviews.llvm.org/D38820 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D38820: [CGExprScalar] Add missing types in function GetIntrinsic
Carrot created this revision. In function GetIntrinsic, not all types are covered. Types double and long long are missed, type long is wrongly treated same as int, it should be same as long long. These problems cause compiler crashes when compiling code in PR31161. This patch fixed the problem. https://reviews.llvm.org/D38820 Files: lib/CodeGen/CGExprScalar.cpp test/CodeGen/ppc-vector-compare.cc Index: test/CodeGen/ppc-vector-compare.cc === --- test/CodeGen/ppc-vector-compare.cc +++ test/CodeGen/ppc-vector-compare.cc @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -target-feature +altivec -triple powerpc64-unknown-unknown -emit-llvm %s \ +// RUN: %clang_cc1 -target-feature +vsx -triple powerpc64-unknown-unknown -emit-llvm %s \ // RUN:-o - | FileCheck %s #include @@ -9,3 +9,26 @@ return v1 == v2; } +// CHECK-LABEL: @_Z5test2Dv2_mS_Dv2_lS0_Dv2_yS1_Dv2_xS2_Dv2_dS3_ +bool test2(vector unsigned long v1, vector unsigned long v2, + vector long v3, vector long v4, + vector unsigned long long v5, vector unsigned long long v6, + vector long long v7, vector long long v8, + vector double v9, vector double v10) { + // CHECK: @llvm.ppc.altivec.vcmpequd.p + bool res = v1 == v2; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v3 == v4; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v5 == v6; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v7 == v8; + + // CHECK: @llvm.ppc.vsx.xvcmpeqdp.p + res |= v9 == v10; + return res; +} + Index: lib/CodeGen/CGExprScalar.cpp === --- lib/CodeGen/CGExprScalar.cpp +++ lib/CodeGen/CGExprScalar.cpp @@ -3120,16 +3120,25 @@ return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequh_p : llvm::Intrinsic::ppc_altivec_vcmpgtsh_p; case BuiltinType::UInt: - case BuiltinType::ULong: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequw_p : llvm::Intrinsic::ppc_altivec_vcmpgtuw_p; case BuiltinType::Int: - case BuiltinType::Long: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequw_p : llvm::Intrinsic::ppc_altivec_vcmpgtsw_p; + case BuiltinType::ULong: + case BuiltinType::ULongLong: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequd_p : +llvm::Intrinsic::ppc_altivec_vcmpgtud_p; + case BuiltinType::Long: + case BuiltinType::LongLong: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequd_p : +llvm::Intrinsic::ppc_altivec_vcmpgtsd_p; case BuiltinType::Float: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpeqfp_p : llvm::Intrinsic::ppc_altivec_vcmpgtfp_p; + case BuiltinType::Double: +return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_vsx_xvcmpeqdp_p : +llvm::Intrinsic::ppc_vsx_xvcmpgtdp_p; } } Index: test/CodeGen/ppc-vector-compare.cc === --- test/CodeGen/ppc-vector-compare.cc +++ test/CodeGen/ppc-vector-compare.cc @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -target-feature +altivec -triple powerpc64-unknown-unknown -emit-llvm %s \ +// RUN: %clang_cc1 -target-feature +vsx -triple powerpc64-unknown-unknown -emit-llvm %s \ // RUN:-o - | FileCheck %s #include @@ -9,3 +9,26 @@ return v1 == v2; } +// CHECK-LABEL: @_Z5test2Dv2_mS_Dv2_lS0_Dv2_yS1_Dv2_xS2_Dv2_dS3_ +bool test2(vector unsigned long v1, vector unsigned long v2, + vector long v3, vector long v4, + vector unsigned long long v5, vector unsigned long long v6, + vector long long v7, vector long long v8, + vector double v9, vector double v10) { + // CHECK: @llvm.ppc.altivec.vcmpequd.p + bool res = v1 == v2; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v3 == v4; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v5 == v6; + + // CHECK: @llvm.ppc.altivec.vcmpequd.p + res |= v7 == v8; + + // CHECK: @llvm.ppc.vsx.xvcmpeqdp.p + res |= v9 == v10; + return res; +} + Index: lib/CodeGen/CGExprScalar.cpp === --- lib/CodeGen/CGExprScalar.cpp +++ lib/CodeGen/CGExprScalar.cpp @@ -3120,16 +3120,25 @@ return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequh_p : llvm::Intrinsic::ppc_altivec_vcmpgtsh_p; case BuiltinType::UInt: - case BuiltinType::ULong: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequw_p : llvm::Intrinsic::ppc_altivec_vcmpgtuw_p; case BuiltinType::Int: - case BuiltinType::Long: return (IT == VCMPEQ) ? llvm::Intrinsic::ppc_altivec_vcmpequw_p : llvm::Intrinsic::ppc_altivec_vcmpgtsw_p; + case BuiltinType::ULong: + case Builti