Speed up vfill_pp()

diff --git a/lib/Scalar/Vec/Util.pm b/lib/Scalar/Vec/Util.pm
index c80d6424c1c4dc920c4b9729053a7fd271b00a81..12d049c26364708fa28e59b337745040da53e5e4 100644 (file)
--- a/lib/Scalar/Vec/Util.pm
+++ b/lib/Scalar/Vec/Util.pm
@@ -81,8 +81,17 @@ sub vfill_pp {
  (undef, my $s, my $l, my $x) = @_;
  croak "Invalid argument" unless _alldef @_;
  return unless $l;
- $x = 1 if $x;
- vec($_[0], $_, 1) = $x for $s .. $s + $l - 1;
+ $x = ~0 if $x;
+ my $SIZE = 32;
+ my $t = int($s / $SIZE) + 1;
+ my $u = int(($s + $l) / $SIZE);
+ if ($SIZE * $t < $s + $l and $t <= $u) {
+  vec($_[0], $_, 1)     = $x for $s .. $SIZE * $t - 1;
+  vec($_[0], $_, $SIZE) = $x for $t .. $u - 1;
+  vec($_[0], $_, 1)     = $x for $SIZE * $u .. $s + $l - 1;
+ } else {
+  vec($_[0], $_, 1) = $x for $s .. $s + $l - 1;
+ }
 }
 
 =head2 C<< vcopy $from => $from_start, $to => $to_start, $length >>

diff --git a/t/10-veq-pp.t b/t/10-veq-pp.t
index ffd721a76ce95f665df24da863e56f74369f6f17..98fea99ad69657588fef72c64396bc3d5b300d82 100644 (file)
--- a/t/10-veq-pp.t
+++ b/t/10-veq-pp.t
@@ -5,7 +5,7 @@ use warnings;
 
 use Test::More 'no_plan';
 
-use Scalar::Vec::Util qw/SVU_SIZE/;
+use Scalar::Vec::Util;
 
 eval { Scalar::Vec::Util::veq_pp(undef, 0, my $y, 0, 0) };
 like($@, qr/Invalid\s+argument/, 'first argument undef croaks');
@@ -18,12 +18,15 @@ like($@, qr/Invalid\s+argument/, 'fourth argument undef croaks');
 eval { Scalar::Vec::Util::veq_pp(my $x, 0, my $y, 0, undef) };
 like($@, qr/Invalid\s+argument/, 'fifth argument undef croaks');
 
-my $p = SVU_SIZE;
-$p = 8 if $p < 8;
+my $p = 8;
 my $n = 3 * $p;
 my $q = 1;
 
-*myfill = *Scalar::Vec::Util::vfill_pp;
+sub myfill {
+ (undef, my $s, my $l, my $x) = @_;
+ $x = 1 if $x;
+ vec($_[0], $_, 1) = $x for $s .. $s + $l - 1;
+}
 
 sub rst { myfill($_[0], 0, $n, 0) }
   

diff --git a/t/11-veq.t b/t/11-veq.t
index 418e13e29b0676bdb65481e32cadde19368d521a..3d141b35c052572ac0149fb28d87cad13f238f14 100644 (file)
--- a/t/11-veq.t
+++ b/t/11-veq.t
@@ -23,7 +23,11 @@ $p = 8 if $p < 8;
 my $n = 3 * $p;
 my $q = 1;
 
-*myfill = *Scalar::Vec::Util::vfill_pp;
+sub myfill {
+ (undef, my $s, my $l, my $x) = @_;
+ $x = 1 if $x;
+ vec($_[0], $_, 1) = $x for $s .. $s + $l - 1;
+}
 
 sub rst { myfill($_[0], 0, $n, 0) }
   

diff --git a/t/20-vfill-pp.t b/t/20-vfill-pp.t
index 5986db8be44cd4861dd0445c36061bbb07eec623..aaf3618a78f6a1c2a46a8a62124a79bfffdbaadb 100644 (file)
--- a/t/20-vfill-pp.t
+++ b/t/20-vfill-pp.t
@@ -15,3 +15,34 @@ eval { Scalar::Vec::Util::vfill_pp(my $x, 0, undef, 0) };
 like($@, qr/Invalid\s+argument/, 'third argument undef croaks');
 eval { Scalar::Vec::Util::vfill_pp(my $x, 0, 0, undef) };
 like($@, qr/Invalid\s+argument/, 'fourth argument undef croaks');
+
+my $p = 8;
+my $n = 3 * $p;
+my $q = 1;
+
+sub myfill {
+ (undef, my $s, my $l, my $x) = @_;
+ $x = 1 if $x;
+ vec($_[0], $_, 1) = $x for $s .. $s + $l - 1;
+}
+
+*myeq = *Scalar::Vec::Util::veq_pp;
+
+sub rst { myfill($_[0], 0, $n, 0); $_[0] = '' }
+
+my ($v, $c) = ('') x 2;
+
+my @s = ($p - $q) .. ($p + $q);
+for my $s (@s) {
+ for my $l (0 .. $n - 1) {
+  next if $s + $l > $n;
+  rst $c;
+  myfill($c, 0,  $s, 0);
+  myfill($c, $s, $l, 1);
+  rst $v;
+  Scalar::Vec::Util::vfill_pp($v, 0,  $s, 0);
+  Scalar::Vec::Util::vfill_pp($v, $s, $l, 1);
+  ok(myeq($v, 0, $c, 0, $n), "vfill_pp $s, $l");
+  is(length $v, length $c,   "vfill_pp $s, $l length");
+ }
+}