From 6f510552bed76cab35ee4a944136bd0fc54d4c6f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 18 Jul 2023 13:25:04 +1000 Subject: [PATCH] cgen: add type casts for some avx2 methods --- internal/cgen/builtin.go | 31 ++++++++++++-------------- release/c/wuffs-unsupported-snapshot.c | 16 ++++++------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index c7601094..6a49e628 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -96,7 +96,7 @@ func (g *gen) writeBuiltinCall(b *buffer, n *a.Expr, sideEffectsOnly bool, depth if qid[1].IsNumType() { return g.writeBuiltinNumType(b, recv, method.Ident(), n.Args(), depth) } else if qid[1].IsBuiltInCPUArch() { - return g.writeBuiltinCPUArch(b, recv, method.Ident(), n.Args(), sideEffectsOnly, depth) + return g.writeBuiltinCPUArch(b, recv, method.Ident(), n.MType(), n.Args(), sideEffectsOnly, depth) } else { switch qid[1] { case t.IDIOReader: @@ -450,7 +450,7 @@ func (g *gen) writeBuiltinTokenWriter(b *buffer, recv *a.Expr, method t.ID, args return g.writeBuiltinIO(b, recv, method, args, depth) } -func (g *gen) writeBuiltinCPUArch(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, sideEffectsOnly bool, depth uint32) error { +func (g *gen) writeBuiltinCPUArch(b *buffer, recv *a.Expr, method t.ID, returnType *a.TypeExpr, args []*a.Node, sideEffectsOnly bool, depth uint32) error { switch id := recv.MType().QID()[1]; { case id == t.IDARMCRC32Utility, id == t.IDARMCRC32U32: return g.writeBuiltinCPUArchARMCRC32(b, recv, method, args, sideEffectsOnly, depth) @@ -458,7 +458,7 @@ func (g *gen) writeBuiltinCPUArch(b *buffer, recv *a.Expr, method t.ID, args []* return g.writeBuiltinCPUArchARMNeon(b, recv, method, args, sideEffectsOnly, depth) case id == t.IDX86SSE42Utility, id == t.IDX86M128I, id == t.IDX86AVX2Utility, id == t.IDX86M256I: - return g.writeBuiltinCPUArchX86(b, recv, method, args, sideEffectsOnly, depth) + return g.writeBuiltinCPUArchX86(b, recv, method, returnType, args, sideEffectsOnly, depth) } return fmt.Errorf("internal error: unsupported cpu_arch method %s.%s", recv.MType().Str(g.tm), method.Str(g.tm)) @@ -606,7 +606,7 @@ func (g *gen) writeBuiltinCPUArchARMNeon(b *buffer, recv *a.Expr, method t.ID, a return nil } -func (g *gen) writeBuiltinCPUArchX86(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, sideEffectsOnly bool, depth uint32) error { +func (g *gen) writeBuiltinCPUArchX86(b *buffer, recv *a.Expr, method t.ID, returnType *a.TypeExpr, args []*a.Node, sideEffectsOnly bool, depth uint32) error { methodStr := method.Str(g.tm) if strings.HasPrefix(methodStr, "make_") { fName, tName, ptr := "", "", false @@ -744,19 +744,12 @@ func (g *gen) writeBuiltinCPUArchX86(b *buffer, recv *a.Expr, method t.ID, args b.writes(")))") return nil - } else if strings.HasPrefix(methodStr, "_mm_extract_epi") { - size := methodStr[len("_mm_extract_epi"):] - b.printf("((uint%s_t)(_mm_extract_epi%s(", size, size) - if err := g.writeExpr(b, recv, false, depth); err != nil { - return err - } - b.writes(", ") - b.writes("(int32_t)(") - if err := g.writeExpr(b, args[0].AsArg().Value(), false, depth); err != nil { - return err - } - b.writes("))))") - return nil + } + + if returnType.IsNumType() { + b.writes("((") + b.writes(cTypeNames[returnType.QID()[1]]) + b.writes(")(") } b.writes(methodStr) @@ -777,6 +770,10 @@ func (g *gen) writeBuiltinCPUArchX86(b *buffer, recv *a.Expr, method t.ID, args b.writes(argAfter) } b.writes(")") + + if returnType.IsNumType() { + b.writes("))") + } return nil } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index ed5da687..26233a38 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -40373,14 +40373,14 @@ wuffs_jpeg__decoder__decode_idct_x86_avx2( v_finaldh = _mm256_unpackhi_epi64(v_ftc0d0g0h0, v_ftc4d4g4h4); v_final0145 = _mm256_add_epi8(_mm256_packs_epi16(v_finalae, v_finalbf), v_k_8080); v_final2367 = _mm256_add_epi8(_mm256_packs_epi16(v_finalcg, v_finaldh), v_k_8080); - v_final0 = _mm256_extract_epi64(v_final0145, (int32_t)(0u)); - v_final1 = _mm256_extract_epi64(v_final0145, (int32_t)(1u)); - v_final2 = _mm256_extract_epi64(v_final2367, (int32_t)(0u)); - v_final3 = _mm256_extract_epi64(v_final2367, (int32_t)(1u)); - v_final4 = _mm256_extract_epi64(v_final0145, (int32_t)(2u)); - v_final5 = _mm256_extract_epi64(v_final0145, (int32_t)(3u)); - v_final6 = _mm256_extract_epi64(v_final2367, (int32_t)(2u)); - v_final7 = _mm256_extract_epi64(v_final2367, (int32_t)(3u)); + v_final0 = ((uint64_t)(_mm256_extract_epi64(v_final0145, (int32_t)(0u)))); + v_final1 = ((uint64_t)(_mm256_extract_epi64(v_final0145, (int32_t)(1u)))); + v_final2 = ((uint64_t)(_mm256_extract_epi64(v_final2367, (int32_t)(0u)))); + v_final3 = ((uint64_t)(_mm256_extract_epi64(v_final2367, (int32_t)(1u)))); + v_final4 = ((uint64_t)(_mm256_extract_epi64(v_final0145, (int32_t)(2u)))); + v_final5 = ((uint64_t)(_mm256_extract_epi64(v_final0145, (int32_t)(3u)))); + v_final6 = ((uint64_t)(_mm256_extract_epi64(v_final2367, (int32_t)(2u)))); + v_final7 = ((uint64_t)(_mm256_extract_epi64(v_final2367, (int32_t)(3u)))); if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) { return wuffs_base__make_empty_struct(); }