From 8fe987e0b2d46b3c325974424064d551c2b51207 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 9 Jul 2024 16:31:58 +1000 Subject: [PATCH] base: add sign_extend_convert_u8_u32 --- internal/cgen/base/fundamental-private.h | 3 ++ lang/builtin/builtin.go | 1 + release/c/wuffs-unsupported-snapshot.c | 51 +++++------------------- std/webp/decode_transform.wuffs | 48 +++------------------- 4 files changed, 19 insertions(+), 84 deletions(-) diff --git a/internal/cgen/base/fundamental-private.h b/internal/cgen/base/fundamental-private.h index 49689a56..fb72c8a7 100644 --- a/internal/cgen/base/fundamental-private.h +++ b/internal/cgen/base/fundamental-private.h @@ -173,6 +173,9 @@ wuffs_private_impl__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { // ---------------- Numeric Types (Utility) +#define wuffs_base__utility__sign_extend_convert_u8_u32(a) \ + ((uint32_t)(int32_t)(int8_t)(a)) + #define wuffs_base__utility__sign_extend_convert_u16_u32(a) \ ((uint32_t)(int32_t)(int16_t)(a)) diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 4f5d0f5a..f71106c7 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -395,6 +395,7 @@ var funcsOther = [...]string{ "min_incl_x: u32, min_incl_y: u32, max_incl_x: u32, max_incl_y: u32) rect_ii_u32", "utility.make_rect_ie_u32(" + "min_incl_x: u32, min_incl_y: u32, max_excl_x: u32, max_excl_y: u32) rect_ie_u32", + "utility.sign_extend_convert_u8_u32(a: u8) u32", "utility.sign_extend_convert_u16_u32(a: u16) u32", "utility.sign_extend_rshift_u32(a: u32, n: u32[..= 31]) u32", "utility.sign_extend_rshift_u64(a: u64, n: u32[..= 63]) u64", diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index d9d0df33..65718a6f 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -15834,6 +15834,9 @@ wuffs_private_impl__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { // ---------------- Numeric Types (Utility) +#define wuffs_base__utility__sign_extend_convert_u8_u32(a) \ + ((uint32_t)(int32_t)(int8_t)(a)) + #define wuffs_base__utility__sign_extend_convert_u16_u32(a) \ ((uint32_t)(int32_t)(int16_t)(a)) @@ -69431,42 +69434,6 @@ WUFFS_WEBP__HUFFMAN_TABLE_BASE_OFFSETS[5] WUFFS_BASE__POTENTIALLY_UNUSED = { 1612u, 0u, 511u, 1022u, 1533u, }; -static const uint32_t -WUFFS_WEBP__SIGN_EXTEND_I8_I32[256] WUFFS_BASE__POTENTIALLY_UNUSED = { - 0u, 1u, 2u, 3u, 4u, 5u, 6u, 7u, - 8u, 9u, 10u, 11u, 12u, 13u, 14u, 15u, - 16u, 17u, 18u, 19u, 20u, 21u, 22u, 23u, - 24u, 25u, 26u, 27u, 28u, 29u, 30u, 31u, - 32u, 33u, 34u, 35u, 36u, 37u, 38u, 39u, - 40u, 41u, 42u, 43u, 44u, 45u, 46u, 47u, - 48u, 49u, 50u, 51u, 52u, 53u, 54u, 55u, - 56u, 57u, 58u, 59u, 60u, 61u, 62u, 63u, - 64u, 65u, 66u, 67u, 68u, 69u, 70u, 71u, - 72u, 73u, 74u, 75u, 76u, 77u, 78u, 79u, - 80u, 81u, 82u, 83u, 84u, 85u, 86u, 87u, - 88u, 89u, 90u, 91u, 92u, 93u, 94u, 95u, - 96u, 97u, 98u, 99u, 100u, 101u, 102u, 103u, - 104u, 105u, 106u, 107u, 108u, 109u, 110u, 111u, - 112u, 113u, 114u, 115u, 116u, 117u, 118u, 119u, - 120u, 121u, 122u, 123u, 124u, 125u, 126u, 127u, - 4294967168u, 4294967169u, 4294967170u, 4294967171u, 4294967172u, 4294967173u, 4294967174u, 4294967175u, - 4294967176u, 4294967177u, 4294967178u, 4294967179u, 4294967180u, 4294967181u, 4294967182u, 4294967183u, - 4294967184u, 4294967185u, 4294967186u, 4294967187u, 4294967188u, 4294967189u, 4294967190u, 4294967191u, - 4294967192u, 4294967193u, 4294967194u, 4294967195u, 4294967196u, 4294967197u, 4294967198u, 4294967199u, - 4294967200u, 4294967201u, 4294967202u, 4294967203u, 4294967204u, 4294967205u, 4294967206u, 4294967207u, - 4294967208u, 4294967209u, 4294967210u, 4294967211u, 4294967212u, 4294967213u, 4294967214u, 4294967215u, - 4294967216u, 4294967217u, 4294967218u, 4294967219u, 4294967220u, 4294967221u, 4294967222u, 4294967223u, - 4294967224u, 4294967225u, 4294967226u, 4294967227u, 4294967228u, 4294967229u, 4294967230u, 4294967231u, - 4294967232u, 4294967233u, 4294967234u, 4294967235u, 4294967236u, 4294967237u, 4294967238u, 4294967239u, - 4294967240u, 4294967241u, 4294967242u, 4294967243u, 4294967244u, 4294967245u, 4294967246u, 4294967247u, - 4294967248u, 4294967249u, 4294967250u, 4294967251u, 4294967252u, 4294967253u, 4294967254u, 4294967255u, - 4294967256u, 4294967257u, 4294967258u, 4294967259u, 4294967260u, 4294967261u, 4294967262u, 4294967263u, - 4294967264u, 4294967265u, 4294967266u, 4294967267u, 4294967268u, 4294967269u, 4294967270u, 4294967271u, - 4294967272u, 4294967273u, 4294967274u, 4294967275u, 4294967276u, 4294967277u, 4294967278u, 4294967279u, - 4294967280u, 4294967281u, 4294967282u, 4294967283u, 4294967284u, 4294967285u, 4294967286u, 4294967287u, - 4294967288u, 4294967289u, 4294967290u, 4294967291u, 4294967292u, 4294967293u, 4294967294u, 4294967295u, -}; - static const uint8_t WUFFS_WEBP__DISTANCE_MAP[120] WUFFS_BASE__POTENTIALLY_UNUSED = { 24u, 7u, 23u, 25u, 40u, 6u, 39u, 41u, @@ -71382,9 +71349,9 @@ wuffs_webp__decoder__apply_transform_cross_color( v_x = 0u; while (v_x < self->private_impl.f_width) { if (((v_x & v_mask) == 0u) && (((uint64_t)(v_tile_data.len)) >= 4u)) { - v_g2r = WUFFS_WEBP__SIGN_EXTEND_I8_I32[v_tile_data.ptr[0u]]; - v_g2b = WUFFS_WEBP__SIGN_EXTEND_I8_I32[v_tile_data.ptr[1u]]; - v_r2b = WUFFS_WEBP__SIGN_EXTEND_I8_I32[v_tile_data.ptr[2u]]; + v_g2r = wuffs_base__utility__sign_extend_convert_u8_u32(v_tile_data.ptr[0u]); + v_g2b = wuffs_base__utility__sign_extend_convert_u8_u32(v_tile_data.ptr[1u]); + v_r2b = wuffs_base__utility__sign_extend_convert_u8_u32(v_tile_data.ptr[2u]); v_tile_data = wuffs_base__slice_u8__subslice_i(v_tile_data, 4u); } if (((uint64_t)(a_pix.len)) >= 4u) { @@ -71395,9 +71362,9 @@ wuffs_webp__decoder__apply_transform_cross_color( #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wconversion" #endif - v_r += ((uint8_t)((((uint32_t)(WUFFS_WEBP__SIGN_EXTEND_I8_I32[v_g] * v_g2r)) >> 5u))); - v_b += ((uint8_t)((((uint32_t)(WUFFS_WEBP__SIGN_EXTEND_I8_I32[v_g] * v_g2b)) >> 5u))); - v_b += ((uint8_t)((((uint32_t)(WUFFS_WEBP__SIGN_EXTEND_I8_I32[v_r] * v_r2b)) >> 5u))); + v_r += ((uint8_t)((((uint32_t)(wuffs_base__utility__sign_extend_convert_u8_u32(v_g) * v_g2r)) >> 5u))); + v_b += ((uint8_t)((((uint32_t)(wuffs_base__utility__sign_extend_convert_u8_u32(v_g) * v_g2b)) >> 5u))); + v_b += ((uint8_t)((((uint32_t)(wuffs_base__utility__sign_extend_convert_u8_u32(v_r) * v_r2b)) >> 5u))); #if defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/std/webp/decode_transform.wuffs b/std/webp/decode_transform.wuffs index 39f5d7d8..dae5be31 100644 --- a/std/webp/decode_transform.wuffs +++ b/std/webp/decode_transform.wuffs @@ -321,9 +321,9 @@ pri func decoder.apply_transform_cross_color!(pix: slice base.u8, tile_data: ros assert x < 0x4000 via "a < b: a < c; c <= b"(c: this.width) if ((x & mask) == 0) and (tile_data.length() >= 4) { - g2r = SIGN_EXTEND_I8_I32[tile_data[0]] - g2b = SIGN_EXTEND_I8_I32[tile_data[1]] - r2b = SIGN_EXTEND_I8_I32[tile_data[2]] + g2r = this.util.sign_extend_convert_u8_u32(a: tile_data[0]) + g2b = this.util.sign_extend_convert_u8_u32(a: tile_data[1]) + r2b = this.util.sign_extend_convert_u8_u32(a: tile_data[2]) tile_data = tile_data[4 ..] } @@ -331,9 +331,9 @@ pri func decoder.apply_transform_cross_color!(pix: slice base.u8, tile_data: ros b = args.pix[0] g = args.pix[1] r = args.pix[2] - r ~mod+= (((SIGN_EXTEND_I8_I32[g] ~mod* g2r) >> 5) & 0xFF) as base.u8 - b ~mod+= (((SIGN_EXTEND_I8_I32[g] ~mod* g2b) >> 5) & 0xFF) as base.u8 - b ~mod+= (((SIGN_EXTEND_I8_I32[r] ~mod* r2b) >> 5) & 0xFF) as base.u8 + r ~mod+= (((this.util.sign_extend_convert_u8_u32(a: g) ~mod* g2r) >> 5) & 0xFF) as base.u8 + b ~mod+= (((this.util.sign_extend_convert_u8_u32(a: g) ~mod* g2b) >> 5) & 0xFF) as base.u8 + b ~mod+= (((this.util.sign_extend_convert_u8_u32(a: r) ~mod* r2b) >> 5) & 0xFF) as base.u8 args.pix[0] = b args.pix[2] = r args.pix = args.pix[4 ..] @@ -426,39 +426,3 @@ pri func decoder.apply_transform_color_indexing!(pix: slice base.u8) { y += 1 } } - -// TODO: we shouldn't need a lookup table for converting i8 to i32. -pri const SIGN_EXTEND_I8_I32 : roarray[256] base.u32 = [ - 0x0000_0000, 0x0000_0001, 0x0000_0002, 0x0000_0003, 0x0000_0004, 0x0000_0005, 0x0000_0006, 0x0000_0007, - 0x0000_0008, 0x0000_0009, 0x0000_000A, 0x0000_000B, 0x0000_000C, 0x0000_000D, 0x0000_000E, 0x0000_000F, - 0x0000_0010, 0x0000_0011, 0x0000_0012, 0x0000_0013, 0x0000_0014, 0x0000_0015, 0x0000_0016, 0x0000_0017, - 0x0000_0018, 0x0000_0019, 0x0000_001A, 0x0000_001B, 0x0000_001C, 0x0000_001D, 0x0000_001E, 0x0000_001F, - 0x0000_0020, 0x0000_0021, 0x0000_0022, 0x0000_0023, 0x0000_0024, 0x0000_0025, 0x0000_0026, 0x0000_0027, - 0x0000_0028, 0x0000_0029, 0x0000_002A, 0x0000_002B, 0x0000_002C, 0x0000_002D, 0x0000_002E, 0x0000_002F, - 0x0000_0030, 0x0000_0031, 0x0000_0032, 0x0000_0033, 0x0000_0034, 0x0000_0035, 0x0000_0036, 0x0000_0037, - 0x0000_0038, 0x0000_0039, 0x0000_003A, 0x0000_003B, 0x0000_003C, 0x0000_003D, 0x0000_003E, 0x0000_003F, - 0x0000_0040, 0x0000_0041, 0x0000_0042, 0x0000_0043, 0x0000_0044, 0x0000_0045, 0x0000_0046, 0x0000_0047, - 0x0000_0048, 0x0000_0049, 0x0000_004A, 0x0000_004B, 0x0000_004C, 0x0000_004D, 0x0000_004E, 0x0000_004F, - 0x0000_0050, 0x0000_0051, 0x0000_0052, 0x0000_0053, 0x0000_0054, 0x0000_0055, 0x0000_0056, 0x0000_0057, - 0x0000_0058, 0x0000_0059, 0x0000_005A, 0x0000_005B, 0x0000_005C, 0x0000_005D, 0x0000_005E, 0x0000_005F, - 0x0000_0060, 0x0000_0061, 0x0000_0062, 0x0000_0063, 0x0000_0064, 0x0000_0065, 0x0000_0066, 0x0000_0067, - 0x0000_0068, 0x0000_0069, 0x0000_006A, 0x0000_006B, 0x0000_006C, 0x0000_006D, 0x0000_006E, 0x0000_006F, - 0x0000_0070, 0x0000_0071, 0x0000_0072, 0x0000_0073, 0x0000_0074, 0x0000_0075, 0x0000_0076, 0x0000_0077, - 0x0000_0078, 0x0000_0079, 0x0000_007A, 0x0000_007B, 0x0000_007C, 0x0000_007D, 0x0000_007E, 0x0000_007F, - 0xFFFF_FF80, 0xFFFF_FF81, 0xFFFF_FF82, 0xFFFF_FF83, 0xFFFF_FF84, 0xFFFF_FF85, 0xFFFF_FF86, 0xFFFF_FF87, - 0xFFFF_FF88, 0xFFFF_FF89, 0xFFFF_FF8A, 0xFFFF_FF8B, 0xFFFF_FF8C, 0xFFFF_FF8D, 0xFFFF_FF8E, 0xFFFF_FF8F, - 0xFFFF_FF90, 0xFFFF_FF91, 0xFFFF_FF92, 0xFFFF_FF93, 0xFFFF_FF94, 0xFFFF_FF95, 0xFFFF_FF96, 0xFFFF_FF97, - 0xFFFF_FF98, 0xFFFF_FF99, 0xFFFF_FF9A, 0xFFFF_FF9B, 0xFFFF_FF9C, 0xFFFF_FF9D, 0xFFFF_FF9E, 0xFFFF_FF9F, - 0xFFFF_FFA0, 0xFFFF_FFA1, 0xFFFF_FFA2, 0xFFFF_FFA3, 0xFFFF_FFA4, 0xFFFF_FFA5, 0xFFFF_FFA6, 0xFFFF_FFA7, - 0xFFFF_FFA8, 0xFFFF_FFA9, 0xFFFF_FFAA, 0xFFFF_FFAB, 0xFFFF_FFAC, 0xFFFF_FFAD, 0xFFFF_FFAE, 0xFFFF_FFAF, - 0xFFFF_FFB0, 0xFFFF_FFB1, 0xFFFF_FFB2, 0xFFFF_FFB3, 0xFFFF_FFB4, 0xFFFF_FFB5, 0xFFFF_FFB6, 0xFFFF_FFB7, - 0xFFFF_FFB8, 0xFFFF_FFB9, 0xFFFF_FFBA, 0xFFFF_FFBB, 0xFFFF_FFBC, 0xFFFF_FFBD, 0xFFFF_FFBE, 0xFFFF_FFBF, - 0xFFFF_FFC0, 0xFFFF_FFC1, 0xFFFF_FFC2, 0xFFFF_FFC3, 0xFFFF_FFC4, 0xFFFF_FFC5, 0xFFFF_FFC6, 0xFFFF_FFC7, - 0xFFFF_FFC8, 0xFFFF_FFC9, 0xFFFF_FFCA, 0xFFFF_FFCB, 0xFFFF_FFCC, 0xFFFF_FFCD, 0xFFFF_FFCE, 0xFFFF_FFCF, - 0xFFFF_FFD0, 0xFFFF_FFD1, 0xFFFF_FFD2, 0xFFFF_FFD3, 0xFFFF_FFD4, 0xFFFF_FFD5, 0xFFFF_FFD6, 0xFFFF_FFD7, - 0xFFFF_FFD8, 0xFFFF_FFD9, 0xFFFF_FFDA, 0xFFFF_FFDB, 0xFFFF_FFDC, 0xFFFF_FFDD, 0xFFFF_FFDE, 0xFFFF_FFDF, - 0xFFFF_FFE0, 0xFFFF_FFE1, 0xFFFF_FFE2, 0xFFFF_FFE3, 0xFFFF_FFE4, 0xFFFF_FFE5, 0xFFFF_FFE6, 0xFFFF_FFE7, - 0xFFFF_FFE8, 0xFFFF_FFE9, 0xFFFF_FFEA, 0xFFFF_FFEB, 0xFFFF_FFEC, 0xFFFF_FFED, 0xFFFF_FFEE, 0xFFFF_FFEF, - 0xFFFF_FFF0, 0xFFFF_FFF1, 0xFFFF_FFF2, 0xFFFF_FFF3, 0xFFFF_FFF4, 0xFFFF_FFF5, 0xFFFF_FFF6, 0xFFFF_FFF7, - 0xFFFF_FFF8, 0xFFFF_FFF9, 0xFFFF_FFFA, 0xFFFF_FFFB, 0xFFFF_FFFC, 0xFFFF_FFFD, 0xFFFF_FFFE, 0xFFFF_FFFF, -]