From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 569133858D38 for ; Wed, 1 Feb 2023 09:37:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 569133858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-wm1-x332.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so882557wma.1 for ; Wed, 01 Feb 2023 01:37:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=bFRR6KESLRebUhM1b/F9s4zlLAXSIQJxZOhd4JJJolQ=; b=f24GpudmABEHRVGfXyzUjLqzTO2go8I9LcFPxSKzXEu6CXhuyMwj+ceTulNwDTdS+D mYGtswH4XJaHZbmbOBqqDjHSJFstrrGJ7kkKa8DSuHLJkWlUBTqAq40UAvXtbuAMkozB bekGiaXgEWNRQrPaOn0xfwtRy7TqXyY1Gfapoa18NkiJKQnhgqGBtKYI4gK49rQL8GU3 zZhIb8tU3b0gT1ll+wnICR3R1ww6DVZXtOOhGTodXzvYHaAYmdH8pj6KabrvVnEQpJP1 rm91cvYy6yHPaUaBUcsfMl6BGZDsIyAox59Jl0oeXj794ARp/IK/pJMaXkZu/sTsX2vt SBEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bFRR6KESLRebUhM1b/F9s4zlLAXSIQJxZOhd4JJJolQ=; b=SHfDfefFictCcfz62ERYcK9F8Uf+nZDOBkg3n0zH6xh6lkK/HAVxGs0sKPTKvU+dsl EFL4eEPZ9s8ptgjdOaPeBAbNQExRyLowFfGEW/Q//5K/DuBV9qmNOesW/jFy4TnLIZZa 2AafBKYCs5BndkqsDr4aRCuARPT55s4Sl6U8TPYmHzfGmwUqovH621zc/MQD0v2WkllY evCumjhkw0uAYiPGw++abvktklc56ajvr5CdcT7biDG5UYU6acrrRr64cBxkojikketa d1MCSngXlECWJ6vu37XEaoHtyvc9FaOvI21jrymIOynuUwc+2ZUMMB4tprXg0qNCZbrj hnJg== X-Gm-Message-State: AO0yUKVtep8yNyF2u+IoEYFOJU0TrTYK7yzuTOhL7SRwYHzEsZVgskiV 9vIHmAZ9E8xDR6trHdagiEmx2cpMWtIxCy9+ugtdMg== X-Google-Smtp-Source: AK7set+Z7yKiqr1BWhzqMNviQ9FsT5FKfqvWF0pjgzp2NRRwjaJzfqKLHJjvzlgjUAC1vUu71AjRXtMfhNqzV5pyczU= X-Received: by 2002:a05:600c:3b22:b0:3dc:b713:67ae with SMTP id m34-20020a05600c3b2200b003dcb71367aemr63365wms.68.1675244230791; Wed, 01 Feb 2023 01:37:10 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Prathamesh Kulkarni Date: Wed, 1 Feb 2023 15:06:35 +0530 Message-ID: Subject: Re: [aarch64] Use dup and zip1 for interleaving elements in initializing vector To: Prathamesh Kulkarni , gcc Patches , richard.sandiford@arm.com Content-Type: multipart/mixed; boundary="0000000000004aa0e905f3a031d8" X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SCC_10_SHORT_WORD_LINES,SCC_5_SHORT_WORD_LINES,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --0000000000004aa0e905f3a031d8 Content-Type: text/plain; charset="UTF-8" On Thu, 12 Jan 2023 at 21:21, Richard Sandiford wrote: > > Prathamesh Kulkarni writes: > > On Tue, 6 Dec 2022 at 07:01, Prathamesh Kulkarni > > wrote: > >> > >> On Mon, 5 Dec 2022 at 16:50, Richard Sandiford > >> wrote: > >> > > >> > Richard Sandiford via Gcc-patches writes: > >> > > Prathamesh Kulkarni writes: > >> > >> Hi, > >> > >> For the following test-case: > >> > >> > >> > >> int16x8_t foo(int16_t x, int16_t y) > >> > >> { > >> > >> return (int16x8_t) { x, y, x, y, x, y, x, y }; > >> > >> } > >> > >> > >> > >> Code gen at -O3: > >> > >> foo: > >> > >> dup v0.8h, w0 > >> > >> ins v0.h[1], w1 > >> > >> ins v0.h[3], w1 > >> > >> ins v0.h[5], w1 > >> > >> ins v0.h[7], w1 > >> > >> ret > >> > >> > >> > >> For 16 elements, it results in 8 ins instructions which might not be > >> > >> optimal perhaps. > >> > >> I guess, the above code-gen would be equivalent to the following ? > >> > >> dup v0.8h, w0 > >> > >> dup v1.8h, w1 > >> > >> zip1 v0.8h, v0.8h, v1.8h > >> > >> > >> > >> I have attached patch to do the same, if number of elements >= 8, > >> > >> which should be possibly better compared to current code-gen ? > >> > >> Patch passes bootstrap+test on aarch64-linux-gnu. > >> > >> Does the patch look OK ? > >> > >> > >> > >> Thanks, > >> > >> Prathamesh > >> > >> > >> > >> diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc > >> > >> index c91df6f5006..e5dea70e363 100644 > >> > >> --- a/gcc/config/aarch64/aarch64.cc > >> > >> +++ b/gcc/config/aarch64/aarch64.cc > >> > >> @@ -22028,6 +22028,39 @@ aarch64_expand_vector_init (rtx target, rtx vals) > >> > >> return; > >> > >> } > >> > >> > >> > >> + /* Check for interleaving case. > >> > >> + For eg if initializer is (int16x8_t) {x, y, x, y, x, y, x, y}. > >> > >> + Generate following code: > >> > >> + dup v0.h, x > >> > >> + dup v1.h, y > >> > >> + zip1 v0.h, v0.h, v1.h > >> > >> + for "large enough" initializer. */ > >> > >> + > >> > >> + if (n_elts >= 8) > >> > >> + { > >> > >> + int i; > >> > >> + for (i = 2; i < n_elts; i++) > >> > >> + if (!rtx_equal_p (XVECEXP (vals, 0, i), XVECEXP (vals, 0, i % 2))) > >> > >> + break; > >> > >> + > >> > >> + if (i == n_elts) > >> > >> + { > >> > >> + machine_mode mode = GET_MODE (target); > >> > >> + rtx dest[2]; > >> > >> + > >> > >> + for (int i = 0; i < 2; i++) > >> > >> + { > >> > >> + rtx x = copy_to_mode_reg (GET_MODE_INNER (mode), XVECEXP (vals, 0, i)); > >> > > > >> > > Formatting nit: long line. > >> > > > >> > >> + dest[i] = gen_reg_rtx (mode); > >> > >> + aarch64_emit_move (dest[i], gen_vec_duplicate (mode, x)); > >> > >> + } > >> > > > >> > > This could probably be written: > >> > > > >> > > for (int i = 0; i < 2; i++) > >> > > { > >> > > rtx x = expand_vector_broadcast (mode, XVECEXP (vals, 0, i)); > >> > > dest[i] = force_reg (GET_MODE_INNER (mode), x); > >> > > >> > Oops, I meant "mode" rather than "GET_MODE_INNER (mode)", sorry. > >> Thanks, I have pushed the change in > >> 769370f3e2e04823c8a621d8ffa756dd83ebf21e after running > >> bootstrap+test on aarch64-linux-gnu. > > Hi Richard, > > I have attached a patch that extends the transform if one half is dup > > and other is set of constants. > > For eg: > > int8x16_t f(int8_t x) > > { > > return (int8x16_t) { x, 1, x, 2, x, 3, x, 4, x, 5, x, 6, x, 7, x, 8 }; > > } > > > > code-gen trunk: > > f: > > adrp x1, .LC0 > > ldr q0, [x1, #:lo12:.LC0] > > ins v0.b[0], w0 > > ins v0.b[2], w0 > > ins v0.b[4], w0 > > ins v0.b[6], w0 > > ins v0.b[8], w0 > > ins v0.b[10], w0 > > ins v0.b[12], w0 > > ins v0.b[14], w0 > > ret > > > > code-gen with patch: > > f: > > dup v0.16b, w0 > > adrp x0, .LC0 > > ldr q1, [x0, #:lo12:.LC0] > > zip1 v0.16b, v0.16b, v1.16b > > ret > > > > Bootstrapped+tested on aarch64-linux-gnu. > > Does it look OK ? > > Looks like a nice improvement. It'll need to wait for GCC 14 now though. > > However, rather than handle this case specially, I think we should instead > take a divide-and-conquer approach: split the initialiser into even and > odd elements, find the best way of loading each part, then compare the > cost of these sequences + ZIP with the cost of the fallback code (the code > later in aarch64_expand_vector_init). > > For example, doing that would allow: > > { x, y, 0, y, 0, y, 0, y, 0, y } > > to be loaded more easily, even though the even elements aren't wholly > constant. Hi Richard, I have attached a prototype patch based on the above approach. It subsumes specializing for above {x, y, x, y, x, y, x, y} case by generating same sequence, thus I removed that hunk, and improves the following cases: (a) int8x16_t f_s16(int8_t x) { return (int8x16_t) { x, 1, x, 2, x, 3, x, 4, x, 5, x, 6, x, 7, x, 8 }; } code-gen trunk: f_s16: adrp x1, .LC0 ldr q0, [x1, #:lo12:.LC0] ins v0.b[0], w0 ins v0.b[2], w0 ins v0.b[4], w0 ins v0.b[6], w0 ins v0.b[8], w0 ins v0.b[10], w0 ins v0.b[12], w0 ins v0.b[14], w0 ret code-gen with patch: f_s16: dup v0.16b, w0 adrp x0, .LC0 ldr q1, [x0, #:lo12:.LC0] zip1 v0.16b, v0.16b, v1.16b ret (b) int8x16_t f_s16(int8_t x, int8_t y) { return (int8x16_t) { x, y, 1, y, 2, y, 3, y, 4, y, 5, y, 6, y, 7, y }; } code-gen trunk: f_s16: adrp x2, .LC0 ldr q0, [x2, #:lo12:.LC0] ins v0.b[0], w0 ins v0.b[1], w1 ins v0.b[3], w1 ins v0.b[5], w1 ins v0.b[7], w1 ins v0.b[9], w1 ins v0.b[11], w1 ins v0.b[13], w1 ins v0.b[15], w1 ret code-gen patch: f_s16: adrp x2, .LC0 dup v1.16b, w1 ldr q0, [x2, #:lo12:.LC0] ins v0.b[0], w0 zip1 v0.16b, v0.16b, v1.16b ret There are a couple of issues I have come across: (1) Choosing element to pad vector. For eg, if we are initiailizing a vector say { x, y, 0, y, 1, y, 2, y } with mode V8HI. We split it into { x, 0, 1, 2 } and { y, y, y, y} However since the mode is V8HI, we would need to pad the above split vectors with 4 more elements to match up to vector length. For {x, 0, 1, 2} using any constant is the obvious choice while for {y, y, y, y} using 'y' is the obvious choice thus making them: {x, 0, 1, 2, 0, 0, 0, 0} and {y, y, y, y, y, y, y, y} These would be then merged using zip1 which would discard the lower half of both vectors. Currently I encoded the above two heuristics in aarch64_expand_vector_init_get_padded_elem: (a) If split portion contains a constant, use the constant to pad the vector. (b) If split portion only contains variables, then use the most frequently repeating variable to pad the vector. I suppose tho this could be improved ? (2) Setting cost for zip1: Currently it returns 4 as cost for following zip1 insn: (set (reg:V8HI 102) (unspec:V8HI [ (reg:V8HI 103) (reg:V8HI 108) ] UNSPEC_ZIP1)) I am not sure if that's correct, or if not, what cost to use in this case for zip1 ? Thanks, Prathamesh > > Thanks, > Richard > > > > > Thanks, > > Prathamesh > >> > > > >> Thanks, > >> Prathamesh > >> > > >> > > } > >> > > > >> > > which avoids forcing constant elements into a register before the duplication. > >> > > OK with that change if it works. > >> > > > >> > > Thanks, > >> > > Richard > >> > > > >> > >> + > >> > >> + rtvec v = gen_rtvec (2, dest[0], dest[1]); > >> > >> + emit_set_insn (target, gen_rtx_UNSPEC (mode, v, UNSPEC_ZIP1)); > >> > >> + return; > >> > >> + } > >> > >> + } > >> > >> + > >> > >> enum insn_code icode = optab_handler (vec_set_optab, mode); > >> > >> gcc_assert (icode != CODE_FOR_nothing); > >> > >> > >> > >> diff --git a/gcc/testsuite/gcc.target/aarch64/interleave-init-1.c b/gcc/testsuite/gcc.target/aarch64/interleave-init-1.c > >> > >> new file mode 100644 > >> > >> index 00000000000..ee775048589 > >> > >> --- /dev/null > >> > >> +++ b/gcc/testsuite/gcc.target/aarch64/interleave-init-1.c > >> > >> @@ -0,0 +1,37 @@ > >> > >> +/* { dg-do compile } */ > >> > >> +/* { dg-options "-O3" } */ > >> > >> +/* { dg-final { check-function-bodies "**" "" "" } } */ > >> > >> + > >> > >> +#include > >> > >> + > >> > >> +/* > >> > >> +** foo: > >> > >> +** ... > >> > >> +** dup v[0-9]+\.8h, w[0-9]+ > >> > >> +** dup v[0-9]+\.8h, w[0-9]+ > >> > >> +** zip1 v[0-9]+\.8h, v[0-9]+\.8h, v[0-9]+\.8h > >> > >> +** ... > >> > >> +** ret > >> > >> +*/ > >> > >> + > >> > >> +int16x8_t foo(int16_t x, int y) > >> > >> +{ > >> > >> + int16x8_t v = (int16x8_t) {x, y, x, y, x, y, x, y}; > >> > >> + return v; > >> > >> +} > >> > >> + > >> > >> +/* > >> > >> +** foo2: > >> > >> +** ... > >> > >> +** dup v[0-9]+\.8h, w[0-9]+ > >> > >> +** movi v[0-9]+\.8h, 0x1 > >> > >> +** zip1 v[0-9]+\.8h, v[0-9]+\.8h, v[0-9]+\.8h > >> > >> +** ... > >> > >> +** ret > >> > >> +*/ > >> > >> + > >> > >> +int16x8_t foo2(int16_t x) > >> > >> +{ > >> > >> + int16x8_t v = (int16x8_t) {x, 1, x, 1, x, 1, x, 1}; > >> > >> + return v; > >> > >> +} > > > > diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc > > index 9a79a9e7928..411e85f52a4 100644 > > --- a/gcc/config/aarch64/aarch64.cc > > +++ b/gcc/config/aarch64/aarch64.cc > > @@ -21984,6 +21984,54 @@ aarch64_simd_make_constant (rtx vals) > > return NULL_RTX; > > } > > > > +/* Subroutine of aarch64_expand_vector_init. > > + Check if VALS has same element at every alternate position > > + from START_POS. */ > > + > > +static > > +bool aarch64_init_interleaving_dup_p (rtx vals, int start_pos) > > +{ > > + for (int i = start_pos + 2; i < XVECLEN (vals, 0); i += 2) > > + if (!rtx_equal_p (XVECEXP (vals, 0, start_pos), XVECEXP (vals, 0, i))) > > + return false; > > + return true; > > +} > > + > > +/* Subroutine of aarch64_expand_vector_init. > > + Check if every alternate element in VALS starting from START_POS > > + is a constant. */ > > + > > +static > > +bool aarch64_init_interleaving_const_p (rtx vals, int start_pos) > > +{ > > + for (int i = start_pos; i < XVECLEN (vals, 0); i += 2) > > + if (!CONSTANT_P (XVECEXP (vals, 0, i))) > > + return false; > > + return true; > > +} > > + > > +/* Subroutine of aarch64_expand_vector_init. > > + Copy all odd-numbered or even-numbered elements from VALS > > + depending on CONST_EVEN. > > + For eg if VALS is { x, 1, x, 2, x, 3, x, 4 } > > + return {1, 2, 3, 4, 1, 1, 1, 1}. > > + We are only interested in the first half {0 ... n_elts/2} since > > + that will be used by zip1 for merging. Fill the second half > > + with an arbitrary value since it will be discarded. */ > > + > > +static > > +rtx aarch64_init_interleaving_shift_init (rtx vals, bool const_even) > > +{ > > + int n_elts = XVECLEN (vals, 0); > > + rtvec vec = rtvec_alloc (n_elts); > > + int i; > > + for (i = 0; i < n_elts / 2; i++) > > + RTVEC_ELT (vec, i) = XVECEXP (vals, 0, (const_even) ? 2 * i : 2 * i + 1); > > + for (; i < n_elts; i++) > > + RTVEC_ELT (vec, i) = RTVEC_ELT (vec, 0); > > + return gen_rtx_CONST_VECTOR (GET_MODE (vals), vec); > > +} > > + > > /* Expand a vector initialisation sequence, such that TARGET is > > initialised to contain VALS. */ > > > > @@ -22048,22 +22096,55 @@ aarch64_expand_vector_init (rtx target, rtx vals) > > return; > > } > > > > - /* Check for interleaving case. > > - For eg if initializer is (int16x8_t) {x, y, x, y, x, y, x, y}. > > - Generate following code: > > - dup v0.h, x > > - dup v1.h, y > > - zip1 v0.h, v0.h, v1.h > > - for "large enough" initializer. */ > > + /* Check for interleaving case for "large enough" initializer. > > + Currently we handle following cases: > > + (a) Even part is dup and odd part is const. > > + (b) Odd part is dup and even part is const. > > + (c) Both even and odd parts are dup. */ > > > > if (n_elts >= 8) > > { > > - int i; > > - for (i = 2; i < n_elts; i++) > > - if (!rtx_equal_p (XVECEXP (vals, 0, i), XVECEXP (vals, 0, i % 2))) > > - break; > > + bool even_dup = false, even_const = false; > > + bool odd_dup = false, odd_const = false; > > + > > + even_dup = aarch64_init_interleaving_dup_p (vals, 0); > > + if (!even_dup) > > + even_const = aarch64_init_interleaving_const_p (vals, 0); > > + > > + odd_dup = aarch64_init_interleaving_dup_p (vals, 1); > > + if (!odd_dup) > > + odd_const = aarch64_init_interleaving_const_p (vals, 1); > > + > > + /* This case should already be handled above when all elements are constants. */ > > + gcc_assert (!(even_const && odd_const)); > > > > - if (i == n_elts) > > + if (even_dup && odd_const) > > + { > > + rtx dup_reg = expand_vector_broadcast (mode, XVECEXP (vals, 0, 0)); > > + dup_reg = force_reg (mode, dup_reg); > > + > > + rtx const_reg = gen_reg_rtx (mode); > > + rtx const_vector = aarch64_init_interleaving_shift_init (vals, false); > > + aarch64_expand_vector_init (const_reg, const_vector); > > + > > + rtvec v = gen_rtvec (2, dup_reg, const_reg); > > + emit_set_insn (target, gen_rtx_UNSPEC (mode, v, UNSPEC_ZIP1)); > > + return; > > + } > > + else if (odd_dup && even_const) > > + { > > + rtx dup_reg = expand_vector_broadcast (mode, XVECEXP (vals, 0, 1)); > > + dup_reg = force_reg (mode, dup_reg); > > + > > + rtx const_reg = gen_reg_rtx (mode); > > + rtx const_vector = aarch64_init_interleaving_shift_init (vals, true); > > + aarch64_expand_vector_init (const_reg, const_vector); > > + > > + rtvec v = gen_rtvec (2, const_reg, dup_reg); > > + emit_set_insn (target, gen_rtx_UNSPEC (mode, v, UNSPEC_ZIP1)); > > + return; > > + } > > + else if (even_dup && odd_dup) > > { > > machine_mode mode = GET_MODE (target); > > rtx dest[2]; > > diff --git a/gcc/testsuite/gcc.target/aarch64/interleave-init-2.c b/gcc/testsuite/gcc.target/aarch64/interleave-init-2.c > > new file mode 100644 > > index 00000000000..3ad06c00451 > > --- /dev/null > > +++ b/gcc/testsuite/gcc.target/aarch64/interleave-init-2.c > > @@ -0,0 +1,51 @@ > > +/* { dg-do compile } */ > > +/* { dg-options "-O3" } */ > > +/* { dg-final { check-function-bodies "**" "" "" } } */ > > + > > +#include "arm_neon.h" > > + > > +/* > > +**foo: > > +** ... > > +** dup v[0-9]+\.8h, w[0-9]+ > > +** adrp x[0-9]+, .LC[0-9]+ > > +** ldr q[0-9]+, \[x[0-9]+, #:lo12:.LC[0-9]+\] > > +** zip1 v[0-9]+\.8h, v[0-9]+\.8h, v[0-9]+\.8h > > +** ... > > +*/ > > + > > +int16x8_t foo(int16_t x) > > +{ > > + return (int16x8_t) { x, 1, x, 2, x, 3, x, 4 }; > > +} > > + > > + > > +/* > > +**foo2: > > +** ... > > +** dup v[0-9]+\.8h, w[0-9]+ > > +** adrp x[0-9]+, .LC[0-9]+ > > +** ldr q[0-9]+, \[x[0-9]+, #:lo12:.LC[0-9]+\] > > +** zip1 v[0-9]+\.8h, v[0-9]+\.8h, v[0-9]+\.8h > > +** ... > > +*/ > > + > > +int16x8_t foo2(int16_t x) > > +{ > > + return (int16x8_t) { 1, x, 2, x, 3, x, 4, x }; > > +} > > + > > +/* > > +**foo3: > > +** ... > > +** dup v[0-9]+\.8h, v[0-9]+\.h\[0\] > > +** adrp x[0-9]+, .LC[0-9]+ > > +** ldr q[0-9]+, \[x[0-9]+, #:lo12:.LC[0-9]+\] > > +** zip1 v[0-9]+\.8h, v[0-9]+\.8h, v[0-9]+\.8h > > +** ... > > +*/ > > + > > +float16x8_t foo3(float16_t x) > > +{ > > + return (float16x8_t) { x, 1.0, x, 2.0, x, 3.0, x, 4.0 }; > > +} --0000000000004aa0e905f3a031d8 Content-Type: text/plain; charset="US-ASCII"; name="gnu-821-1.txt" Content-Disposition: attachment; filename="gnu-821-1.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ldlgu5km0 ZGlmZiAtLWdpdCBhL2djYy9jb25maWcvYWFyY2g2NC9hYXJjaDY0LmNjIGIvZ2NjL2NvbmZpZy9h YXJjaDY0L2FhcmNoNjQuY2MKaW5kZXggMTdjMWUyM2U1YjUuLjAwOTBmYjQ3ZDk4IDEwMDY0NAot LS0gYS9nY2MvY29uZmlnL2FhcmNoNjQvYWFyY2g2NC5jYworKysgYi9nY2MvY29uZmlnL2FhcmNo NjQvYWFyY2g2NC5jYwpAQCAtMTUwNjUsNiArMTUwNjUsMTEgQEAgY29zdF9wbHVzOgogICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgY2FzZSBVTlNQRUM6CisgICAgICAvKiBGSVhNRTogV2hhdCBj b3N0IHRvIHVzZSBmb3IgemlwMSA/CisJIEN1cnJlbnRseSB1c2luZyBkZWZhdWx0IGNvc3QuICAq LworICAgICAgaWYgKFhJTlQgKHgsIDEpID09IFVOU1BFQ19aSVAxKQorCWJyZWFrOworCiAgICAg ICAvKiBUaGUgZmxvYXRpbmcgcG9pbnQgcm91bmQgdG8gaW50ZWdlciBmcmludCogaW5zdHJ1Y3Rp b25zLiAgKi8KICAgICAgIGlmIChhYXJjaDY0X2ZyaW50X3Vuc3BlY19wIChYSU5UICh4LCAxKSkp CiAgICAgICAgIHsKQEAgLTIxOTcyLDExICsyMTk3Nyw0NCBAQCBhYXJjaDY0X3NpbWRfbWFrZV9j b25zdGFudCAocnR4IHZhbHMpCiAgICAgcmV0dXJuIE5VTExfUlRYOwogfQogCisvKiBUaGUgYWxn b3JpdGhtIHdpbGwgZmlsbCBtYXRjaGVzWypdWzBdIHdpdGggdGhlIGVhcmxpZXN0IG1hdGNoaW5n IGVsZW1lbnQsCisgICBhbmQgbWF0Y2hlc1tYXVsxXSB3aXRoIHRoZSBjb3VudCBvZiBkdXBsaWNh dGUgZWxlbWVudHMgKGlmIFggaXMgdGhlCisgICBlYXJsaWVzdCBlbGVtZW50IHdoaWNoIGhhcyBk dXBsaWNhdGVzKS4gICovCisKK3N0YXRpYyB2b2lkCithYXJjaDY0X2V4cGFuZF92ZWN0b3JfaW5p dF9nZXRfbW9zdF9yZXBlYXRpbmdfZWxlbSAocnR4IHZhbHMsIGludCBuLAorCQkJCQkJICAgIGlu dCAoKm1hdGNoZXMpWzJdLAorCQkJCQkJICAgIGludCAmbWF4diwgaW50ICZtYXhlbGVtZW50KQor eworICBtZW1zZXQgKG1hdGNoZXMsIDAsIDE2ICogMiAqIHNpemVvZiAoaW50KSk7CisgIGZvciAo aW50IGkgPSAwOyBpIDwgbjsgaSsrKQorICAgIHsKKyAgICAgIGZvciAoaW50IGogPSAwOyBqIDw9 IGk7IGorKykKKwl7CisJICBpZiAocnR4X2VxdWFsX3AgKFhWRUNFWFAgKHZhbHMsIDAsIGkpLCBY VkVDRVhQICh2YWxzLCAwLCBqKSkpCisJICAgIHsKKwkgICAgICBtYXRjaGVzW2ldWzBdID0gajsK KwkgICAgICBtYXRjaGVzW2pdWzFdKys7CisJICAgICAgYnJlYWs7CisJICAgIH0KKwl9CisgICAg fQorICAKKyAgbWF4ZWxlbWVudCA9IDA7CisgIG1heHYgPSAwOworICBmb3IgKGludCBpID0gMDsg aSA8IG47IGkrKykKKyAgICBpZiAobWF0Y2hlc1tpXVsxXSA+IG1heHYpCisgICAgICB7CisJbWF4 ZWxlbWVudCA9IGk7CisJbWF4diA9IG1hdGNoZXNbaV1bMV07CisgICAgICB9Cit9CisKIC8qIEV4 cGFuZCBhIHZlY3RvciBpbml0aWFsaXNhdGlvbiBzZXF1ZW5jZSwgc3VjaCB0aGF0IFRBUkdFVCBp cwogICAgaW5pdGlhbGlzZWQgdG8gY29udGFpbiBWQUxTLiAgKi8KIAotdm9pZAotYWFyY2g2NF9l eHBhbmRfdmVjdG9yX2luaXQgKHJ0eCB0YXJnZXQsIHJ0eCB2YWxzKQorc3RhdGljIHZvaWQKK2Fh cmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0X2ZhbGxiYWNrIChydHggdGFyZ2V0LCBydHggdmFscykK IHsKICAgbWFjaGluZV9tb2RlIG1vZGUgPSBHRVRfTU9ERSAodGFyZ2V0KTsKICAgc2NhbGFyX21v ZGUgaW5uZXJfbW9kZSA9IEdFVF9NT0RFX0lOTkVSIChtb2RlKTsKQEAgLTIyMDM2LDM4ICsyMjA3 NCw2IEBAIGFhcmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0IChydHggdGFyZ2V0LCBydHggdmFscykK ICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgLyogQ2hlY2sgZm9yIGludGVybGVhdmluZyBjYXNl LgotICAgICBGb3IgZWcgaWYgaW5pdGlhbGl6ZXIgaXMgKGludDE2eDhfdCkge3gsIHksIHgsIHks IHgsIHksIHgsIHl9LgotICAgICBHZW5lcmF0ZSBmb2xsb3dpbmcgY29kZToKLSAgICAgZHVwIHYw LmgsIHgKLSAgICAgZHVwIHYxLmgsIHkKLSAgICAgemlwMSB2MC5oLCB2MC5oLCB2MS5oCi0gICAg IGZvciAibGFyZ2UgZW5vdWdoIiBpbml0aWFsaXplci4gICovCi0KLSAgaWYgKG5fZWx0cyA+PSA4 KQotICAgIHsKLSAgICAgIGludCBpOwotICAgICAgZm9yIChpID0gMjsgaSA8IG5fZWx0czsgaSsr KQotCWlmICghcnR4X2VxdWFsX3AgKFhWRUNFWFAgKHZhbHMsIDAsIGkpLCBYVkVDRVhQICh2YWxz LCAwLCBpICUgMikpKQotCSAgYnJlYWs7Ci0KLSAgICAgIGlmIChpID09IG5fZWx0cykKLQl7Ci0J ICBtYWNoaW5lX21vZGUgbW9kZSA9IEdFVF9NT0RFICh0YXJnZXQpOwotCSAgcnR4IGRlc3RbMl07 Ci0KLQkgIGZvciAoaW50IGkgPSAwOyBpIDwgMjsgaSsrKQotCSAgICB7Ci0JICAgICAgcnR4IHgg PSBleHBhbmRfdmVjdG9yX2Jyb2FkY2FzdCAobW9kZSwgWFZFQ0VYUCAodmFscywgMCwgaSkpOwot CSAgICAgIGRlc3RbaV0gPSBmb3JjZV9yZWcgKG1vZGUsIHgpOwotCSAgICB9Ci0KLQkgIHJ0dmVj IHYgPSBnZW5fcnR2ZWMgKDIsIGRlc3RbMF0sIGRlc3RbMV0pOwotCSAgZW1pdF9zZXRfaW5zbiAo dGFyZ2V0LCBnZW5fcnR4X1VOU1BFQyAobW9kZSwgdiwgVU5TUEVDX1pJUDEpKTsKLQkgIHJldHVy bjsKLQl9Ci0gICAgfQotCiAgIGVudW0gaW5zbl9jb2RlIGljb2RlID0gb3B0YWJfaGFuZGxlciAo dmVjX3NldF9vcHRhYiwgbW9kZSk7CiAgIGdjY19hc3NlcnQgKGljb2RlICE9IENPREVfRk9SX25v dGhpbmcpOwogCkBAIC0yMjA3NSwzMyArMjIwODEsMTUgQEAgYWFyY2g2NF9leHBhbmRfdmVjdG9y X2luaXQgKHJ0eCB0YXJnZXQsIHJ0eCB2YWxzKQogICAgICB0aGUgaW5zZXJ0aW9uIHVzaW5nIGR1 cCBmb3IgdGhlIG1vc3QgY29tbW9uIGVsZW1lbnQKICAgICAgZm9sbG93ZWQgYnkgaW5zZXJ0aW9u cy4gICovCiAKLSAgLyogVGhlIGFsZ29yaXRobSB3aWxsIGZpbGwgbWF0Y2hlc1sqXVswXSB3aXRo IHRoZSBlYXJsaWVzdCBtYXRjaGluZyBlbGVtZW50LAotICAgICBhbmQgbWF0Y2hlc1tYXVsxXSB3 aXRoIHRoZSBjb3VudCBvZiBkdXBsaWNhdGUgZWxlbWVudHMgKGlmIFggaXMgdGhlCi0gICAgIGVh cmxpZXN0IGVsZW1lbnQgd2hpY2ggaGFzIGR1cGxpY2F0ZXMpLiAgKi8KIAogICBpZiAobl92YXIg PT0gbl9lbHRzICYmIG5fZWx0cyA8PSAxNikKICAgICB7Ci0gICAgICBpbnQgbWF0Y2hlc1sxNl1b Ml0gPSB7MH07Ci0gICAgICBmb3IgKGludCBpID0gMDsgaSA8IG5fZWx0czsgaSsrKQotCXsKLQkg IGZvciAoaW50IGogPSAwOyBqIDw9IGk7IGorKykKLQkgICAgewotCSAgICAgIGlmIChydHhfZXF1 YWxfcCAoWFZFQ0VYUCAodmFscywgMCwgaSksIFhWRUNFWFAgKHZhbHMsIDAsIGopKSkKLQkJewot CQkgIG1hdGNoZXNbaV1bMF0gPSBqOwotCQkgIG1hdGNoZXNbal1bMV0rKzsKLQkJICBicmVhazsK LQkJfQotCSAgICB9Ci0JfQotICAgICAgaW50IG1heGVsZW1lbnQgPSAwOwotICAgICAgaW50IG1h eHYgPSAwOwotICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBuX2VsdHM7IGkrKykKLQlpZiAobWF0 Y2hlc1tpXVsxXSA+IG1heHYpCi0JICB7Ci0JICAgIG1heGVsZW1lbnQgPSBpOwotCSAgICBtYXh2 ID0gbWF0Y2hlc1tpXVsxXTsKLQkgIH0KKyAgICAgIGludCBtYXRjaGVzWzE2XVsyXTsKKyAgICAg IGludCBtYXhlbGVtZW50LCBtYXh2OworICAgICAgYWFyY2g2NF9leHBhbmRfdmVjdG9yX2luaXRf Z2V0X21vc3RfcmVwZWF0aW5nX2VsZW0gKHZhbHMsIG5fZWx0cywKKyAgICAgIAkJCQkJCQkgIG1h dGNoZXMsCisJCQkJCQkJICBtYXh2LAorCQkJCQkJCSAgbWF4ZWxlbWVudCk7CiAKICAgICAgIC8q IENyZWF0ZSBhIGR1cGxpY2F0ZSBvZiB0aGUgbW9zdCBjb21tb24gZWxlbWVudCwgdW5sZXNzIGFs bCBlbGVtZW50cwogCSBhcmUgZXF1YWxseSB1c2VsZXNzIHRvIHVzLCBpbiB3aGljaCBjYXNlIGp1 c3QgaW1tZWRpYXRlbHkgc2V0IHRoZQpAQCAtMjIxODksNyArMjIxNzcsNyBAQCBhYXJjaDY0X2V4 cGFuZF92ZWN0b3JfaW5pdCAocnR4IHRhcmdldCwgcnR4IHZhbHMpCiAJICAgIH0KIAkgIFhWRUNF WFAgKGNvcHksIDAsIGkpID0gc3Vic3Q7CiAJfQotICAgICAgYWFyY2g2NF9leHBhbmRfdmVjdG9y X2luaXQgKHRhcmdldCwgY29weSk7CisgICAgICBhYXJjaDY0X2V4cGFuZF92ZWN0b3JfaW5pdF9m YWxsYmFjayAodGFyZ2V0LCBjb3B5KTsKICAgICB9CiAKICAgLyogSW5zZXJ0IHRoZSB2YXJpYWJs ZSBsYW5lcyBkaXJlY3RseS4gICovCkBAIC0yMjIwMyw2ICsyMjE5MSwxMjYgQEAgYWFyY2g2NF9l eHBhbmRfdmVjdG9yX2luaXQgKHJ0eCB0YXJnZXQsIHJ0eCB2YWxzKQogICAgIH0KIH0KIAorLyog RnVuY3Rpb24gdG8gcGFkIGVsZW1lbnRzIGluIFZBTFMgYXMgZGVzY3JpYmVkIGluIHRoZSBjb21t ZW50CisgICBmb3IgYWFyY2g2NF9leHBhbmRfdmVjdG9yX2luaXRfc3BsaXRfdmFscy4gICovCisK K3N0YXRpYyBydHgKK2FhcmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0X2dldF9wYWRkZWRfZWxlbSAo cnR4IHZhbHMsIGludCBuKQoreworICBmb3IgKGludCBpID0gMDsgaSA8IG47IGkrKykKKyAgICB7 CisgICAgICBydHggZWxlbSA9IFhWRUNFWFAgKHZhbHMsIDAsIGkpOworICAgICAgaWYgKENPTlNU X0lOVF9QIChlbGVtKSB8fCBDT05TVF9ET1VCTEVfUCAoZWxlbSkpCisJcmV0dXJuIGVsZW07Cisg ICAgfQorCisgIGludCBtYXRjaGVzWzE2XVsyXTsKKyAgaW50IG1heHYsIG1heGVsZW1lbnQ7Cisg IGFhcmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0X2dldF9tb3N0X3JlcGVhdGluZ19lbGVtICh2YWxz LCBuLCBtYXRjaGVzLCBtYXh2LCBtYXhlbGVtZW50KTsKKyAgcmV0dXJuIFhWRUNFWFAgKHZhbHMs IDAsIG1heGVsZW1lbnQpOworfQorCisvKgorU3BsaXQgdmFscyBpbnRvIGV2ZW4gb3Igb2RkIGhh bGYsIGhvd2V2ZXIgc2luY2UgdGhlIG1vZGUgcmVtYWlucyBzYW1lLAord2UgaGF2ZSB0byBwYWQg dXAgd2l0aCBleHRyYSBlbGVtZW50cyB0byBmaWxsIHZlY3RvciBsZW5ndGguCitUaGUgZnVuY3Rp b24gdXNlcyBjb3VwbGUgb2YgaGV1cmlzdGljcyBmb3IgcGFkZGluZzoKKygxKSBJZiB0aGUgc3Bs aXQgcG9ydGlvbiBjb250YWlucyBhIGNvbnN0YW50LCBwYWQgdGhlIHZlY3RvciB3aXRoCisgICAg Y29uc3RhbnQgZWxlbS4KKyAgICBGb3IgZWcgaWYgc3BsaXQgcG9ydGlvbiBpcyB7eCwgMSwgMiwg M30gYW5kIG1vZGUgaXMgVjhISQorICAgIHRoZW4gdGhlIHJlc3VsdCBpcyB7eCwgMSwgMiwgMywg MSwgMSwgMSwgMX0KKygyKSBJZiB0aGUgc3BsaXQgcG9ydGlvbiBpcyBlbnRpcmVseSBvZiB2YXJp YWJsZXMsIHRoZW4gdXNlIHRoZQorICAgIG1vc3QgZnJlcXVlbnRseSByZXBlYXRpbmcgdmFyaWFi bGUgYXMgcGFkZGluZyBlbGVtZW50LgorICAgIEZvciBlZyBpZiBzcGxpdCBwb3J0aW9uIGlzIHt4 LCB4LCB4LCB5fSBhbmQgbW9kZSBpcyBWOEhJLAorICAgIHRoZW4gdGhlIHJlc3VsdCBpcyB7eCwg eCwgeCwgeCwgeSwgeCwgeCwgeH0KKyAgICBXZSB1c2UgdGhlIG1vc3QgZnJlcXVlbnR5IHJlcGVh dGluZyB2YXJpYWJsZSBzbyBkdXAgd2lsbCBpbml0aWFsaXplCisgICAgbW9zdCBvZiB0aGUgdmVj dG9yIGFuZCB0aGVuIHVzZSBpbnNyIHRvIGluc2VydCByZW1haW5pbmcgb25lcywKKyAgICB3aGlj aCB3aWxsIGJlIGRvbmUgaW4gYWFyY2g2NF9leHBhbmRfdmVjdG9yX2luaXRfZmFsbGJhY2suCisq LworCitzdGF0aWMgcnR4CithYXJjaDY0X2V4cGFuZF92ZWN0b3JfaW5pdF9zcGxpdF92YWxzIChy dHggdmFscywgYm9vbCBldmVuX3ApCit7CisgIHJ0eCBuZXdfdmFscyA9IGNvcHlfcnR4ICh2YWxz KTsKKyAgaW50IG4gPSBYVkVDTEVOICh2YWxzLCAwKTsKKyAgaW50IGk7CisgIGZvciAoaSA9IDA7 IGkgPCBuIC8gMjsgaSsrKQorICAgIFhWRUNFWFAgKG5ld192YWxzLCAwLCBpKQorICAgICAgPSBY VkVDRVhQIChuZXdfdmFscywgMCwgKGV2ZW5fcCkgPyAyICogaSA6IDIgKiBpICsgMSk7CisKKyAg cnR4IHBhZGRlZF92YWwKKyAgICA9IGFhcmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0X2dldF9wYWRk ZWRfZWxlbSAobmV3X3ZhbHMsIG4gLyAyKTsgCisgIGZvciAoOyBpIDwgbjsgaSsrKQorICAgIFhW RUNFWFAgKG5ld192YWxzLCAwLCBpKSA9IHBhZGRlZF92YWw7CisgIHJldHVybiBuZXdfdmFsczsK K30KKworREVCVUdfRlVOQ1RJT04KK3N0YXRpYyB2b2lkCithYXJjaDY0X2V4cGFuZF92ZWN0b3Jf aW5pdF9kZWJ1Z19zZXEgKHJ0eF9pbnNuICpzZXEsIGNvbnN0IGNoYXIgKnMpCit7CisgIGZwcmlu dGYgKHN0ZGVyciwgIiVzOiAldVxuIiwgcywgc2VxX2Nvc3QgKHNlcSwgIW9wdGltaXplX3NpemUp KTsKKyAgZm9yIChydHhfaW5zbiAqaSA9IHNlcTsgaTsgaSA9IE5FWFRfSU5TTiAoaSkpCisgICAg eworICAgICAgZGVidWdfcnR4IChQQVRURVJOIChpKSk7CisgICAgICBmcHJpbnRmIChzdGRlcnIs ICJjb3N0OiAlZFxuIiwgcGF0dGVybl9jb3N0IChQQVRURVJOIChpKSwgIW9wdGltaXplX3NpemUp KTsKKyAgICB9Cit9CisKKy8qCitUaGUgZnVuY3Rpb24gZG9lcyB0aGUgZm9sbG93aW5nOgorKGEp IEdlbmVyYXRlcyBjb2RlIHNlcXVlbmNlIGJ5IHNwbGl0dGluZyBWQUxTIGludG8gZXZlbiBhbmQg b2RkIGhhbHZlcywKKyAgICBhbmQgcmVjdXJzaXZlbHkgY2FsbGluZyBpdHNlbGYgdG8gaW5pdGlh bGl6ZSB0aGVtIGFuZCB0aGVuIG1lcmdlIHVzaW5nCisgICAgemlwMS4KKyhiKSBHZW5lcmF0ZSBj b2RlIHNlcXVlbmNlIGRpcmVjdGx5IHVzaW5nIGFhcmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0X2Zh bGxiYWNrLgorKGMpIENvbXBhcmUgdGhlIGNvc3Qgb2YgY29kZSBzZXF1ZW5jZXMgZ2VuZXJhdGVk IGJ5IChhKSBhbmQgKGIpLCBhbmQgY2hvb3NlCisgICAgdGhlIG1vcmUgZWZmaWNpZW50IG9uZS4K KyovCisKK3ZvaWQKK2FhcmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0XzEgKHJ0eCB0YXJnZXQsIHJ0 eCB2YWxzLCBpbnQgbl9lbHRzKQoreworICBpZiAobl9lbHRzIDwgOCkKKyAgICB7CisgICAgICBh YXJjaDY0X2V4cGFuZF92ZWN0b3JfaW5pdF9mYWxsYmFjayAodGFyZ2V0LCB2YWxzKTsKKyAgICAg IHJldHVybjsKKyAgICB9CisKKyAgbWFjaGluZV9tb2RlIG1vZGUgPSBHRVRfTU9ERSAodGFyZ2V0 KTsKKworICBzdGFydF9zZXF1ZW5jZSAoKTsKKyAgcnR4IGRlc3RbMl07CisgIGZvciAoaW50IGkg PSAwOyBpIDwgMjsgaSsrKQorICAgIHsKKyAgICAgIGRlc3RbaV0gPSBnZW5fcmVnX3J0eCAobW9k ZSk7CisgICAgICBydHggbmV3X3ZhbHMKKwk9IGFhcmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0X3Nw bGl0X3ZhbHMgKHZhbHMsIChpICUgMikgPT0gMCk7CisgICAgICBhYXJjaDY0X2V4cGFuZF92ZWN0 b3JfaW5pdF8xIChkZXN0W2ldLCBuZXdfdmFscywgbl9lbHRzIC8gMik7CisgICAgfQorCisgIHJ0 dmVjIHYgPSBnZW5fcnR2ZWMgKDIsIGRlc3RbMF0sIGRlc3RbMV0pOworICBlbWl0X3NldF9pbnNu ICh0YXJnZXQsIGdlbl9ydHhfVU5TUEVDIChtb2RlLCB2LCBVTlNQRUNfWklQMSkpOworICAKKyAg cnR4X2luc24gKnNlcSA9IGdldF9pbnNucyAoKTsgCisgIGVuZF9zZXF1ZW5jZSAoKTsKKworICBz dGFydF9zZXF1ZW5jZSAoKTsKKyAgYWFyY2g2NF9leHBhbmRfdmVjdG9yX2luaXRfZmFsbGJhY2sg KHRhcmdldCwgdmFscyk7CisgIHJ0eF9pbnNuICpmYWxsYmFja19zZXEgPSBnZXRfaW5zbnMgKCk7 IAorICBlbmRfc2VxdWVuY2UgKCk7CisKKyAgZW1pdF9pbnNuIChzZXFfY29zdCAoc2VxLCAhb3B0 aW1pemVfc2l6ZSkKKwkgICAgIDwgc2VxX2Nvc3QgKGZhbGxiYWNrX3NlcSwgIW9wdGltaXplX3Np emUpCisJICAgICA/IHNlcSA6IGZhbGxiYWNrX3NlcSk7Cit9CisKKy8qIFdyYXBwZXIgYXJvdW5k IGFhcmNoNjRfZXhwYW5kX3ZlY3Rvcl9pbml0XzEuICAqLworCit2b2lkCithYXJjaDY0X2V4cGFu ZF92ZWN0b3JfaW5pdCAocnR4IHRhcmdldCwgcnR4IHZhbHMpCit7CisgIGFhcmNoNjRfZXhwYW5k X3ZlY3Rvcl9pbml0XzEgKHRhcmdldCwgdmFscywgWFZFQ0xFTiAodmFscywgMCkpOworfQorCiAv KiBFbWl0IFJUTCBjb3JyZXNwb25kaW5nIHRvOgogICAgaW5zciBUQVJHRVQsIEVMRU0uICAqLwog CmRpZmYgLS1naXQgYS9nY2MvdGVzdHN1aXRlL2djYy50YXJnZXQvYWFyY2g2NC9pbnRlcmxlYXZl LWluaXQtMS5jIGIvZ2NjL3Rlc3RzdWl0ZS9nY2MudGFyZ2V0L2FhcmNoNjQvdmVjLWluaXQtMTgu YwpzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gZ2NjL3Rlc3RzdWl0ZS9nY2MudGFy Z2V0L2FhcmNoNjQvaW50ZXJsZWF2ZS1pbml0LTEuYwpyZW5hbWUgdG8gZ2NjL3Rlc3RzdWl0ZS9n Y2MudGFyZ2V0L2FhcmNoNjQvdmVjLWluaXQtMTguYwpkaWZmIC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0 ZS9nY2MudGFyZ2V0L2FhcmNoNjQvdmVjLWluaXQtMTkuYyBiL2djYy90ZXN0c3VpdGUvZ2NjLnRh cmdldC9hYXJjaDY0L3ZlYy1pbml0LTE5LmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAuLmQyMDRjN2UxZjhiCi0tLSAvZGV2L251bGwKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9n Y2MudGFyZ2V0L2FhcmNoNjQvdmVjLWluaXQtMTkuYwpAQCAtMCwwICsxLDIxIEBACisvKiB7IGRn LWRvIGNvbXBpbGUgfSAqLworLyogeyBkZy1vcHRpb25zICItTzMiIH0gKi8KKy8qIHsgZGctZmlu YWwgeyBjaGVjay1mdW5jdGlvbi1ib2RpZXMgIioqIiAiIiAiIiB9IH0gKi8KKworI2luY2x1ZGUg PGFybV9uZW9uLmg+CisKKy8qCisqKiBmX3M4OgorKioJLi4uCisqKglkdXAJdlswLTldK1wuMTZi LCB3WzAtOV0rCisqKglhZHJwCXhbMC05XSssIFwuTENbMC05XSsKKyoqCWxkcglxWzAtOV0rLCBc W3hbMC05XSssICM6bG8xMjouTENbMC05XStcXQorKioJemlwMQl2WzAtOV0rXC4xNmIsIHZbMC05 XStcLjE2YiwgdlswLTldK1wuMTZiCisqKglyZXQKKyovCisKK2ludDh4MTZfdCBmX3M4KGludDhf dCB4KQoreworICByZXR1cm4gKGludDh4MTZfdCkgeyB4LCAxLCB4LCAyLCB4LCAzLCB4LCA0LAor ICAgICAgICAgICAgICAgICAgICAgICB4LCA1LCB4LCA2LCB4LCA3LCB4LCA4IH07Cit9CmRpZmYg LS1naXQgYS9nY2MvdGVzdHN1aXRlL2djYy50YXJnZXQvYWFyY2g2NC92ZWMtaW5pdC0yMC5jIGIv Z2NjL3Rlc3RzdWl0ZS9nY2MudGFyZ2V0L2FhcmNoNjQvdmVjLWluaXQtMjAuYwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uYzJjOTc0Njk5NDAKLS0tIC9kZXYvbnVsbAor KysgYi9nY2MvdGVzdHN1aXRlL2djYy50YXJnZXQvYWFyY2g2NC92ZWMtaW5pdC0yMC5jCkBAIC0w LDAgKzEsMjIgQEAKKy8qIHsgZGctZG8gY29tcGlsZSB9ICovCisvKiB7IGRnLW9wdGlvbnMgIi1P MyIgfSAqLworLyogeyBkZy1maW5hbCB7IGNoZWNrLWZ1bmN0aW9uLWJvZGllcyAiKioiICIiICIi IH0gfSAqLworCisjaW5jbHVkZSA8YXJtX25lb24uaD4KKworLyoKKyoqIGZfczg6CisqKgkuLi4K KyoqCWFkcnAJeFswLTldKywgXC5MQ1swLTldKworKioJZHVwCXZbMC05XStcLjE2Yiwgd1swLTld KworKioJbGRyCXFbMC05XSssIFxbeFswLTldKywgIzpsbzEyOlwuTENbMC05XStcXQorKioJaW5z CXYwXC5iXFswXF0sIHcwCisqKgl6aXAxCXZbMC05XStcLjE2YiwgdlswLTldK1wuMTZiLCB2WzAt OV0rXC4xNmIKKyoqCXJldAorKi8KKworaW50OHgxNl90IGZfczgoaW50OF90IHgsIGludDhfdCB5 KQoreworICByZXR1cm4gKGludDh4MTZfdCkgeyB4LCB5LCAxLCB5LCAyLCB5LCAzLCB5LAorICAg ICAgICAgICAgICAgICAgICAgICA0LCB5LCA1LCB5LCA2LCB5LCA3LCB5IH07Cit9CmRpZmYgLS1n aXQgYS9nY2MvdGVzdHN1aXRlL2djYy50YXJnZXQvYWFyY2g2NC92ZWMtaW5pdC0yMS5jIGIvZ2Nj L3Rlc3RzdWl0ZS9nY2MudGFyZ2V0L2FhcmNoNjQvdmVjLWluaXQtMjEuYwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uZTE2NDU5NDg2ZDcKLS0tIC9kZXYvbnVsbAorKysg Yi9nY2MvdGVzdHN1aXRlL2djYy50YXJnZXQvYWFyY2g2NC92ZWMtaW5pdC0yMS5jCkBAIC0wLDAg KzEsMjIgQEAKKy8qIHsgZGctZG8gY29tcGlsZSB9ICovCisvKiB7IGRnLW9wdGlvbnMgIi1PMyIg fSAqLworLyogeyBkZy1maW5hbCB7IGNoZWNrLWZ1bmN0aW9uLWJvZGllcyAiKioiICIiICIiIH0g fSAqLworCisjaW5jbHVkZSA8YXJtX25lb24uaD4KKworLyoKKyoqIGZfczg6CisqKgkuLi4KKyoq CWFkcnAJeFswLTldKywgXC5MQ1swLTldKworKioJbGRyCXFbMC05XSssIFxbeFswLTldKywgIzps bzEyOlwuTENbMC05XStcXQorKioJaW5zCXYwXC5iXFswXF0sIHcwCisqKglpbnMJdjBcLmJcWzFc XSwgdzEKKyoqCS4uLgorKioJcmV0CisqLworCitpbnQ4eDE2X3QgZl9zOChpbnQ4X3QgeCwgaW50 OF90IHkpCit7CisgIHJldHVybiAoaW50OHgxNl90KSB7IHgsIHksIDEsIDIsIDMsIDQsIDUsIDYs CisgICAgICAgICAgICAgICAgICAgICAgIDcsIDgsIDksIDEwLCAxMSwgMTIsIDEzLCAxNCB9Owor fQpkaWZmIC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0ZS9nY2MudGFyZ2V0L2FhcmNoNjQvdmVjLWluaXQt MjIuYyBiL2djYy90ZXN0c3VpdGUvZ2NjLnRhcmdldC9hYXJjaDY0L3ZlYy1pbml0LTIyLmMKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmU1MDE2YTQ3YTNiCi0tLSAvZGV2 L251bGwKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nY2MudGFyZ2V0L2FhcmNoNjQvdmVjLWluaXQtMjIu YwpAQCAtMCwwICsxLDMwIEBACisvKiB7IGRnLWRvIGNvbXBpbGUgfSAqLworLyogeyBkZy1vcHRp b25zICItTzMiIH0gKi8KKy8qIHsgZGctZmluYWwgeyBjaGVjay1mdW5jdGlvbi1ib2RpZXMgIioq IiAiIiAiIiB9IH0gKi8KKworI2luY2x1ZGUgPGFybV9uZW9uLmg+CisKKy8qIFZlcmlmeSB0aGF0 IGZhbGxiYWNrIGNvZGUtc2VxdWVuY2UgaXMgY2hvc2VuIG92ZXIKKyAgIHJlY3Vyc2l2ZWx5IGdl bmVyYXRlZCBjb2RlLXNlcXVlbmNlIG1lcmdlZCB3aXRoIHppcDEuICAqLworCisvKgorKiogZl9z MTY6CisqKgkuLi4KKyoqCXN4dGgJdzAsIHcwCisqKglmbW92CXMwLCB3MAorKioJaW5zCXYwXC5o XFsxXF0sIHcxCisqKglpbnMJdjBcLmhcWzJcXSwgdzIKKyoqCWlucwl2MFwuaFxbM1xdLCB3Mwor KioJaW5zCXYwXC5oXFs0XF0sIHc0CisqKglpbnMJdjBcLmhcWzVcXSwgdzUKKyoqCWlucwl2MFwu aFxbNlxdLCB3NgorKioJaW5zCXYwXC5oXFs3XF0sIHc3CisqKgkuLi4KKyoqCXJldAorKi8KKwor aW50MTZ4OF90IGZfczE2IChpbnQxNl90IHgwLCBpbnQxNl90IHgxLCBpbnQxNl90IHgyLCBpbnQx Nl90IHgzLAorICAgICAgICAgICAgICAgICBpbnQxNl90IHg0LCBpbnQxNl90IHg1LCBpbnQxNl90 IHg2LCBpbnQxNl90IHg3KQoreworICByZXR1cm4gKGludDE2eDhfdCkgeyB4MCwgeDEsIHgyLCB4 MywgeDQsIHg1LCB4NiwgeDcgfTsKK30K --0000000000004aa0e905f3a031d8--