From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D0A61A0555 for ; Wed, 19 Feb 2020 16:57:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C916E1B951; Wed, 19 Feb 2020 16:57:18 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id C3A601B951 for ; Wed, 19 Feb 2020 16:57:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582127837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KLphoGpMgk7M5ZThw/NUGl2csD3OKWXLtevh4q8n17Q=; b=X3Ftwh+VuijyNaAd1CWtik7yvAo9c/smgtWqamOvWQ5e1n7NS7diORTFcGNl9TRvvDSSNC kMc3H2KhFLynN1ALVnQj4Cliy4McByMgnFZcHB7QHyNl8xiKjpJbwYtNlo4LGSf7yWDiR4 MTZ2sEMwFLc/gZRGm5incR60qkcTMiQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-piYAQOg_MGSMR2ifRBAjIQ-1; Wed, 19 Feb 2020 10:57:11 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CB0810CE780; Wed, 19 Feb 2020 15:57:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90925857BF; Wed, 19 Feb 2020 15:57:07 +0000 (UTC) From: Kevin Traynor To: Artur Trybula Cc: dpdk stable Date: Wed, 19 Feb 2020 15:55:55 +0000 Message-Id: <20200219155607.20495-10-ktraynor@redhat.com> In-Reply-To: <20200219155607.20495-1-ktraynor@redhat.com> References: <20200219155607.20495-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: piYAQOg_MGSMR2ifRBAjIQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'test/compress: replace test vector' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/68f15f08842de990ac= 44a5edc07a0bc8b988d44a Thanks. Kevin. --- >From 68f15f08842de990ac44a5edc07a0bc8b988d44a Mon Sep 17 00:00:00 2001 From: Artur Trybula Date: Thu, 6 Feb 2020 10:37:35 +0100 Subject: [PATCH] test/compress: replace test vector [ upstream commit 1692bc53df07dcb1ab059ad6433e6273f37f79ab ] This patch replaces an existing test vector with a new one containing public domain text only. This is to avoid any potential issues re-licensing content as BSD-3 which has no clear original license. Fixes: b06aa643cac4 ("test/compress: add initial unit tests") Signed-off-by: Artur Trybula --- test/test/test_compressdev_test_buffer.h | 182 ++++++++++++----------- 1 file changed, 92 insertions(+), 90 deletions(-) diff --git a/test/test/test_compressdev_test_buffer.h b/test/test/test_comp= ressdev_test_buffer.h index c0492f89a2..d241602445 100644 --- a/test/test/test_compressdev_test_buffer.h +++ b/test/test/test_compressdev_test_buffer.h @@ -1,2 +1,6 @@ +/* SPDX-License-Identifier: (BSD-3-Clause) + * Copyright(c) 2018-2020 Intel Corporation + */ + #ifndef TEST_COMPRESSDEV_TEST_BUFFERS_H_ #define TEST_COMPRESSDEV_TEST_BUFFERS_H_ @@ -191,104 +195,102 @@ static const char test_buf_shakespeare[] =3D =09"ORLANDO=09Go apart, Adam, and thou shalt hear how he will\n"; =20 -/* Snippet of source code in Pascal */ -static const char test_buf_pascal[] =3D -=09"=09Ptr =3D 1..DMem;\n" -=09"=09Loc =3D 1..IMem;\n" -=09"=09Loc0 =3D 0..IMem;\n" -=09"=09EdgeT =3D (hout,lin,hin,lout); {Warning this order is important in= }\n" -=09"=09=09=09=09 {predicates such as gtS,geS}\n" -=09"=09CardT =3D (finite,infinite);\n" -=09"=09ExpT =3D Minexp..Maxexp;\n" -=09"=09ManT =3D Mininf..Maxinf; \n" -=09"=09Pflag =3D (PNull,PSoln,PTrace,PPrint);\n" -=09"=09Sreal =3D record\n" -=09"=09=09 edge:EdgeT;\n" -=09"=09=09 cardinality:CardT;\n" -=09"=09=09 exp:ExpT; {exponent}\n" -=09"=09=09 mantissa:ManT;\n" -=09"=09=09 end;\n" -=09"=09Int =3D record\n" -=09"=09=09 hi:Sreal;\n" -=09"=09=09 lo:Sreal;\n" -=09"=09 end;\n" -=09"=09Instr =3D record\n" -=09"=09=09 Code:OpType;\n" -=09"=09=09 Pars: array[0..Par] of 0..DMem;\n" -=09"=09=09 end;\n" -=09"=09DataMem=3D record\n" -=09"=09=09 D :array [Ptr] of Int;\n" -=09"=09=09 S :array [Loc] of State;\n" -=09"=09=09 LastHalve:Loc;\n" -=09"=09=09 RHalve :array [Loc] of real;\n" -=09"=09=09 end;\n" -=09"=09DataFlags=3Drecord\n" -=09"=09=09 PF=09 :array [Ptr] of Pflag;\n" -=09"=09=09 end;\n" -=09"var\n" -=09"=09Debug : (none,activity,post,trace,dump);\n" -=09"=09Cut : (once,all);\n" -=09"=09GlobalEnd,Verifiable:boolean;\n" -=09"=09HalveThreshold:real;\n" -=09"=09I : array [Loc] of Instr; {Memory holding instructions}\n" -=09"=09End : Loc; {last instruction in I}\n" -=09"=09ParN : array [OpType] of -1..Par; {number of parameters for each = \n" -=09"=09=09=09opcode. -1 means no result}\n" -=09" ParIntersect : array [OpType] of boolean ;\n" -=09"=09DInit : DataMem; {initial memory which is cleared and \n" -=09"=09=09=09=09used in first call}\n" -=09"=09DF : DataFlags; {hold flags for variables, e.g. print/trace}\n" -=09"=09MaxDMem:0..DMem;\n" -=09"=09Shift : array[0..Digits] of 1..maxint;{array of constant multiplie= rs}\n" -=09"=09=09=09=09=09=09{used for alignment etc.}\n" -=09"=09Dummy :Positive;\n" -=09"=09{constant intervals and Sreals}\n" -=09"=09PlusInfS,MinusInfS,PlusSmallS,MinusSmallS,ZeroS,\n" -=09"=09PlusFiniteS,MinusFiniteS:Sreal;\n" -=09"=09Zero,All,AllFinite:Int;\n" +/* Snippet of Alice's Adventures in Wonderland */ +static const char test_buf_alice2[] =3D +=09"`Curiouser and curiouser!' cried Alice (she was so much\n" +=09"surprised, that for the moment she quite forgot how to speak good\n" +=09"English); `now I'm opening out like the largest telescope that\n" +=09"ever was! Good-bye, feet!' (for when she looked down at her\n" +=09"feet, they seemed to be almost out of sight, they were getting so\n" +=09"far off). `Oh, my poor little feet, I wonder who will put on\n" +=09"your shoes and stockings for you now, dears? I'm sure _I_ shan't\n" +=09"be able! I shall be a great deal too far off to trouble myself\n" +=09"about you: you must manage the best way you can; --but I must be\n" +=09"kind to them,' thought Alice, `or perhaps they won't walk the\n" +=09"way I want to go! Let me see: I'll give them a new pair of\n" +=09"boots every Christmas.'\n" =09"\n" -=09"procedure deblank;\n" -=09"var Ch:char;\n" -=09"begin\n" -=09" while (not eof) and (input^ in [' ','=09']) do read(Ch);\n" -=09"end;\n" +=09" And she went on planning to herself how she would manage it.\n" +=09"`They must go by the carrier,' she thought; `and how funny it'll\n" +=09"seem, sending presents to one's own feet! And how odd the\n" +=09"directions will look!\n" =09"\n" -=09"procedure InitialOptions;\n" +=09"=09 ALICE'S RIGHT FOOT, ESQ.\n" +=09"=09=09HEARTHRUG,\n" +=09"=09=09 NEAR THE FENDER,\n" +=09"=09=09=09(WITH ALICE'S LOVE).\n" =09"\n" -=09"#include '/user/profs/cleary/bin/options.i';\n" +=09"Oh dear, what nonsense I'm talking!'\n" =09"\n" -=09" procedure Option;\n" -=09" begin\n" -=09" case Opt of\n" -=09" 'a','A':Debug:=3Dactivity;\n" -=09" 'd','D':Debug:=3Ddump;\n" -=09" 'h','H':HalveThreshold:=3DStringNum/100;\n" -=09" 'n','N':Debug:=3Dnone;\n" -=09" 'p','P':Debug:=3Dpost;\n" -=09" 't','T':Debug:=3Dtrace;\n" -=09" 'v','V':Verifiable:=3Dtrue;\n" -=09" end;\n" -=09" end;\n" +=09" Just then her head struck against the roof of the hall: in\n" +=09"fact she was now more than nine feet high, and she at once took\n" +=09"up the little golden key and hurried off to the garden door.\n" =09"\n" -=09"begin\n" -=09" Debug:=3Dtrace;\n" -=09" Verifiable:=3Dfalse;\n" -=09" HalveThreshold:=3D67/100;\n" -=09" Options;\n" -=09" writeln(Debug);\n" -=09" writeln('Verifiable:',Verifiable);\n" -=09" writeln('Halve threshold',HalveThreshold);\n" -=09"end;{InitialOptions}\n" +=09" Poor Alice! It was as much as she could do, lying down on one\n" +=09"side, to look through into the garden with one eye; but to get\n" +=09"through was more hopeless than ever: she sat down and began to\n" +=09"cry again.\n" =09"\n" -=09"procedure NormalizeUp(E,M:integer;var S:Sreal;var Closed:boolean);\n" -=09"begin\n" -=09"with S do\n" -=09"begin\n" -=09" if M=3D0 then S:=3DZeroS else\n" -=09" if M>0 then\n"; +=09" `You ought to be ashamed of yourself,' said Alice, `a great\n" +=09"girl like you,' (she might well say this), `to go on crying in\n" +=09"this way! Stop this moment, I tell you!' But she went on all\n" +=09"the same, shedding gallons of tears, until there was a large pool\n" +=09"all round her, about four inches deep and reaching half down the\n" +=09"hall.\n" +=09"\n" +=09" After a time she heard a little pattering of feet in the\n" +=09"distance, and she hastily dried her eyes to see what was coming.\n" +=09"It was the White Rabbit returning, splendidly dressed, with a\n" +=09"pair of white kid gloves in one hand and a large fan in the\n" +=09"other: he came trotting along in a great hurry, muttering to\n" +=09"himself as he came, `Oh! the Duchess, the Duchess! Oh! won't she\n" +=09"be savage if I've kept her waiting!' Alice felt so desperate\n" +=09"that she was ready to ask help of any one; so, when the Rabbit\n" +=09"came near her, she began, in a low, timid voice, `If you please,\n" +=09"sir--' The Rabbit started violently, dropped the white kid\n" +=09"gloves and the fan, and skurried away into the darkness as hard\n" +=09"as he could go.\n" +=09"\n" +=09" Alice took up the fan and gloves, and, as the hall was very\n" +=09"hot, she kept fanning herself all the time she went on talking:\n" +=09"`Dear, dear! How queer everything is to-day! And yesterday\n" +=09"things went on just as usual. I wonder if I've been changed in\n" +=09"the night? Let me think: was I the same when I got up this\n" +=09"morning? I almost think I can remember feeling a little\n" +=09"different. But if I'm not the same, the next question is, Who in\n" +=09"the world am I? Ah, THAT'S the great puzzle!' And she began\n" +=09"thinking over all the children she knew that were of the same age\n" +=09"as herself, to see if she could have been changed for any of\n" +=09"them.\n" +=09"\n" +=09" `I'm sure I'm not Ada,' she said, `for her hair goes in such\n" +=09"long ringlets, and mine doesn't go in ringlets at all; and I'm\n" +=09"sure I can't be Mabel, for I know all sorts of things, and she,\n" +=09"oh! she knows such a very little! Besides, SHE'S she, and I'm I,\n" +=09"and--oh dear, how puzzling it all is! I'll try if I know all the\n" +=09"things I used to know. Let me see: four times five is twelve,\n" +=09"and four times six is thirteen, and four times seven is--oh dear!\n" +=09"I shall never get to twenty at that rate! However, the\n" +=09"Multiplication Table doesn't signify: let's try Geography.\n" +=09"London is the capital of Paris, and Paris is the capital of Rome,\n" +=09"and Rome--no, THAT'S all wrong, I'm certain! I must have been\n" +=09"changed for Mabel! I'll try and say ''How doth the little--''\n" +=09"and she crossed her hands on her lap as if she were saying lessons,\n" +=09"and began to repeat it, but her voice sounded hoarse and\n" +=09"strange, and the words did not come the same as they used to do:--\n" +=09"\n" +=09"=09 `How doth the little crocodile\n" +=09"=09 Improve his shining tail,\n" +=09"=09 And pour the waters of the Nile\n" +=09"=09 On every golden scale!\n" +=09"\n" +=09"=09 `How cheerfully he seems to grin,\n" +=09"=09 How neatly spread his claws,\n" +=09"=09 And welcome little fishes in\n" +=09"=09 With gently smiling jaws!'\n"; =20 static const char * const compress_test_bufs[] =3D { =09test_buf_alice, =09test_buf_shakespeare, -=09test_buf_pascal +=09test_buf_alice2 }; =20 --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-19 15:43:50.248462423 +0000 +++ 0010-test-compress-replace-test-vector.patch=092020-02-19 15:43:49.7301= 42013 +0000 @@ -1 +1 @@ -From 1692bc53df07dcb1ab059ad6433e6273f37f79ab Mon Sep 17 00:00:00 2001 +From 68f15f08842de990ac44a5edc07a0bc8b988d44a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1692bc53df07dcb1ab059ad6433e6273f37f79ab ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - app/test/test_compressdev_test_buffer.h | 182 ++++++++++++------------ + test/test/test_compressdev_test_buffer.h | 182 ++++++++++++----------- @@ -18 +19 @@ -diff --git a/app/test/test_compressdev_test_buffer.h b/app/test/test_compr= essdev_test_buffer.h +diff --git a/test/test/test_compressdev_test_buffer.h b/test/test/test_com= pressdev_test_buffer.h @@ -20,2 +21,2 @@ ---- a/app/test/test_compressdev_test_buffer.h -+++ b/app/test/test_compressdev_test_buffer.h +--- a/test/test/test_compressdev_test_buffer.h ++++ b/test/test/test_compressdev_test_buffer.h