From 023d6be296a6fffe158199a85d0af72ef4901681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 18 Mar 2015 06:07:52 +0100
Subject: binary_module_SUITE: Remove unnecessary calls to the binref module

The compile_pattern/1 function in the binref module is a dummy
function. Therefore, calling binref:match/2 once with the plain
pattern and once with a "pre-compiled" pattern will take twice as
long, but will not help us find more errors.

I shaved off one fourth of the running time for random_ref_comp/1
by eliminating the unnecessary calls to the binref module.
---
 lib/stdlib/test/binary_module_SUITE.erl | 41 +++++++++++++++------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'lib')

diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl
index 77986605a2..5248870744 100644
--- a/lib/stdlib/test/binary_module_SUITE.erl
+++ b/lib/stdlib/test/binary_module_SUITE.erl
@@ -1162,9 +1162,8 @@ do_matches_comp2(N,H,A) ->
     end.
 do_matches_comp(N,H) ->
     A = ?MASK_ERROR(binref:matches(H,N)),
-    B = ?MASK_ERROR(binref:matches(H,binref:compile_pattern(N))),
-    C = ?MASK_ERROR(binary:matches(H,N)),
-    D = ?MASK_ERROR(binary:matches(make_unaligned(H),
+    B = ?MASK_ERROR(binary:matches(H,N)),
+    C = ?MASK_ERROR(binary:matches(make_unaligned(H),
 				   binary:compile_pattern([make_unaligned2(X) || X <- N]))),
     if
 	A =/= nomatch ->
@@ -1172,14 +1171,14 @@ do_matches_comp(N,H) ->
 	true ->
 	    ok
     end,
-    case {(A =:= B), (B =:= C),(C =:= D)} of
-	{true,true,true} ->
+    case {(A =:= B), (B =:= C)} of
+	{true,true} ->
 	    true;
 	_ ->
 	    io:format("Failed to match ~p (needle) against ~s (haystack)~n",
 		      [N,H]),
-	    io:format("A:~p,~nB:~p,~n,C:~p,~n,D:~p.~n",
-		      [A,B,C,D]),
+	    io:format("A:~p,~nB:~p,~n,C:~p,~n",
+		      [A,B,C]),
 	    exit(mismatch)
     end.
 
@@ -1221,46 +1220,44 @@ do_random_match_comp4(N,NeedleRange,HaystackRange) ->
 
 do_match_comp(N,H) ->
     A = ?MASK_ERROR(binref:match(H,N)),
-    B = ?MASK_ERROR(binref:match(H,binref:compile_pattern([N]))),
-    C = ?MASK_ERROR(binary:match(make_unaligned(H),N)),
-    D = ?MASK_ERROR(binary:match(H,binary:compile_pattern([N]))),
-    E = ?MASK_ERROR(binary:match(H,binary:compile_pattern(make_unaligned(N)))),
+    B = ?MASK_ERROR(binary:match(make_unaligned(H),N)),
+    C = ?MASK_ERROR(binary:match(H,binary:compile_pattern([N]))),
+    D = ?MASK_ERROR(binary:match(H,binary:compile_pattern(make_unaligned(N)))),
     if
 	A =/= nomatch ->
 	    put(success_counter,get(success_counter)+1);
 	true ->
 	    ok
     end,
-    case {(A =:= B), (B =:= C),(C =:= D),(D =:= E)} of
-	{true,true,true,true} ->
+    case {(A =:= B), (B =:= C),(C =:= D)} of
+	{true,true,true} ->
 	    true;
 	_ ->
 	    io:format("Failed to match ~s (needle) against ~s (haystack)~n",
 		      [N,H]),
-	    io:format("A:~p,~nB:~p,~n,C:~p,~n,D:~p,E:~p.~n",
-		      [A,B,C,D,E]),
+	    io:format("A:~p,~nB:~p,~n,C:~p,~n,D:~p.~n",
+		      [A,B,C,D]),
 	    exit(mismatch)
     end.
 
 do_match_comp3(N,H) ->
     A = ?MASK_ERROR(binref:match(H,N)),
-    B = ?MASK_ERROR(binref:match(H,binref:compile_pattern(N))),
-    C = ?MASK_ERROR(binary:match(H,N)),
-    D = ?MASK_ERROR(binary:match(H,binary:compile_pattern(N))),
+    B = ?MASK_ERROR(binary:match(H,N)),
+    C = ?MASK_ERROR(binary:match(H,binary:compile_pattern(N))),
     if
 	A =/= nomatch ->
 	    put(success_counter,get(success_counter)+1);
 	true ->
 	    ok
     end,
-    case {(A =:= B), (B =:= C),(C =:= D)} of
-	{true,true,true} ->
+    case {(A =:= B),(B =:= C)} of
+	{true,true} ->
 	    true;
 	_ ->
 	    io:format("Failed to match ~s (needle) against ~s (haystack)~n",
 		      [N,H]),
-	    io:format("A:~p,~nB:~p,~n,C:~p,~n,D:~p.~n",
-		      [A,B,C,D]),
+	    io:format("A:~p,~nB:~p,~n,C:~p.~n",
+		      [A,B,C]),
 	    exit(mismatch)
     end.
 
-- 
cgit v1.2.3