compiler: Eliminate num_bif_SUITE

num_bif_SUITE.erl was originally copied from the emulator test
suite. It does not test much of the compiler.

Therefore, remove num_bif_SUITE. Add a new test to bif_SUITE
to test trunc/1 and round/1 in contexts that could be tricky
for the compiler to handle correctly. Note that there is no
need to test abs/1 in bif_SUITE, since it is tested in many
other places (e.g. in guard_SUITE).

3 files changed, 44 insertions, 290 deletions

diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index f0185acbc7..365f4c295e 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -36,7 +36,6 @@ MODULES= \
 	map_SUITE \
 	match_SUITE \
 	misc_SUITE \
-	num_bif_SUITE \
 	receive_SUITE \
 	record_SUITE \
 	regressions_SUITE \
@@ -67,7 +66,6 @@ NO_OPT= \
 	map \
 	match \
 	misc \
-	num_bif \
 	receive \
 	record \
 	trycatch
@@ -78,6 +76,7 @@ INLINE= \
 	beam_block \
 	beam_bool \
 	beam_utils \
+	bif \
 	bs_bincomp \
 	bs_bit_binaries \
 	bs_construct \
@@ -91,7 +90,6 @@ INLINE= \
 	map \
 	match \
 	misc \
-	num_bif \
 	receive \
 	record
 
diff --git a/lib/compiler/test/bif_SUITE.erl b/lib/compiler/test/bif_SUITE.erl
index 51bc71da81..6d7231b426 100644
--- a/lib/compiler/test/bif_SUITE.erl
+++ b/lib/compiler/test/bif_SUITE.erl
@@ -19,9 +19,11 @@
 %%
 -module(bif_SUITE).
 
+-include_lib("syntax_tools/include/merl.hrl").
+
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
-	 beam_validator/1]).
+	 beam_validator/1,trunc_and_friends/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
@@ -32,7 +34,8 @@ all() ->
 
 groups() ->
     [{p,[parallel],
-      [beam_validator
+      [beam_validator,
+       trunc_and_friends
       ]}].
 
 init_per_suite(Config) ->
@@ -63,3 +66,41 @@ food(Curriculum) ->
      catch _ ->
 	     0
      end, Curriculum].
+
+%% Test trunc/1, round/1.
+trunc_and_friends(_Config) ->
+    Bifs = [trunc,round],
+    Fs = trunc_and_friends_1(Bifs),
+    Mod = ?FUNCTION_NAME,
+    Calls = [begin
+		 Atom = erl_syntax:function_name(N),
+		 ?Q("'@Atom'()")
+	     end || N <- Fs],
+    Tree = ?Q(["-module('@Mod@').",
+	       "-export([test/0]).",
+	       "test() -> _@Calls, ok.",
+	       "id(I) -> I."]) ++ Fs,
+    merl:print(Tree),
+    Opts = test_lib:opt_opts(?MODULE),
+    {ok,_Bin} = merl:compile_and_load(Tree, Opts),
+    Mod:test(),
+    ok.
+
+trunc_and_friends_1([F|Fs]) ->
+    Func = list_to_atom("f"++integer_to_list(length(Fs))),
+    [trunc_template(Func, F)|trunc_and_friends_1(Fs)];
+trunc_and_friends_1([]) -> [].
+
+trunc_template(Func, Bif) ->
+    Val = 42.77,
+    Res = erlang:Bif(Val),
+    FloatRes = float(Res),
+    ?Q("'@Func@'() ->
+        Var = id(_@Val@),
+        if _@Bif@(Var) =:= _@Res@ -> ok end,
+	if _@Bif@(Var) == _@FloatRes@ -> ok end,
+	if _@Bif@(Var) == _@Res@ -> ok end,
+        _@Res@ = _@Bif@(Var),
+        try begin _@Bif@(a), ok end
+        catch error:badarg -> ok end,
+        ok.").
diff --git a/lib/compiler/test/num_bif_SUITE.erl b/lib/compiler/test/num_bif_SUITE.erl
deleted file mode 100644
index 7eac90bac3..0000000000
--- a/lib/compiler/test/num_bif_SUITE.erl
+++ /dev/null
@@ -1,285 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
--module(num_bif_SUITE).
-
--include_lib("common_test/include/ct.hrl").
-
-%% Tests optimization of the BIFs:
-%% 	abs/1
-%%	float/1
-%%	float_to_list/1
-%%	integer_to_list/1
-%%	list_to_float/1
-%%	list_to_integer/1
-%%	round/1
-%%	trunc/1
-
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, t_abs/1, t_float/1,
-	 t_float_to_list/1, t_integer_to_list/1,
-	 t_list_to_integer/1,
-	 t_list_to_float_safe/1, t_list_to_float_risky/1,
-	 t_round/1, t_trunc/1]).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    test_lib:recompile(?MODULE),
-    [t_abs, t_float, t_float_to_list, t_integer_to_list,
-     {group, t_list_to_float}, t_list_to_integer, t_round,
-     t_trunc].
-
-groups() -> 
-    [{t_list_to_float, [],
-      [t_list_to_float_safe, t_list_to_float_risky]}].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-t_abs(Config) when is_list(Config) ->
-    %% Floats.
-    5.5 = abs(5.5),
-    0.0 = abs(0.0),
-    100.0 = abs(-100.0),
-    
-    %% Integers.
-    5 = abs(5),
-    0 = abs(0),
-    100 = abs(-100),
-
-    %% The largest smallnum. OTP-3190.
-    X = (1 bsl 27) - 1,
-    X = abs(X),
-    X = abs(X-1)+1,
-    X = abs(X+1)-1,
-    X = abs(-X),
-    X = abs(-X-1)-1,
-    X = abs(-X+1)+1,
-
-    %% Bignums.
-    BigNum = 13984792374983749,
-    BigNum = abs(BigNum),
-    BigNum = abs(-BigNum),
-    ok.
-    
-t_float(Config) when is_list(Config) ->
-    0.0 = float(0),
-    2.5 = float(2.5),
-    0.0 = float(0.0),
-    -100.55 = float(-100.55),
-    42.0 = float(42),
-    -100.0 = float(-100),
-
-    %% Bignums.
-    4294967305.0 = float(4294967305),
-    -4294967305.0 = float(-4294967305),
-
-    %% Extremly big bignums.
-    Big = list_to_integer(lists:duplicate(2000, $1)),
-    {'EXIT', {badarg, _}} = (catch float(Big)),
-
-    %% Invalid types and lists.
-    {'EXIT', {badarg, _}} = (catch list_to_integer(atom)),
-    {'EXIT', {badarg, _}} = (catch list_to_integer(123)),
-    {'EXIT', {badarg, _}} = (catch list_to_integer([$1, [$2]])),
-    {'EXIT', {badarg, _}} = (catch list_to_integer("1.2")),
-    {'EXIT', {badarg, _}} = (catch list_to_integer("a")),
-    {'EXIT', {badarg, _}} = (catch list_to_integer("")),
-    ok.
-
-
-%% Tests float_to_list/1.
-
-t_float_to_list(Config) when is_list(Config) ->
-    test_ftl("0.0e+0", 0.0),
-    test_ftl("2.5e+1", 25.0),
-    test_ftl("2.5e+0", 2.5),
-    test_ftl("2.5e-1", 0.25),
-    test_ftl("-3.5e+17", -350.0e15),
-    ok.
-    
-test_ftl(Expect, Float) ->
-    %% No on the next line -- we want the line number from t_float_to_list.
-    Expect = remove_zeros(lists:reverse(float_to_list(Float)), []).
-
-%% Removes any non-significant zeros in a floating point number.
-%% Example: 2.500000e+01 -> 2.5e+1
-
-remove_zeros([$+, $e|Rest], [$0, X|Result]) ->
-    remove_zeros([$+, $e|Rest], [X|Result]);
-remove_zeros([$-, $e|Rest], [$0, X|Result]) ->
-    remove_zeros([$-, $e|Rest], [X|Result]);
-remove_zeros([$0, $.|Rest], [$e|Result]) ->
-    remove_zeros(Rest, [$., $0, $e|Result]);
-remove_zeros([$0|Rest], [$e|Result]) ->
-    remove_zeros(Rest, [$e|Result]);
-remove_zeros([Char|Rest], Result) ->
-    remove_zeros(Rest, [Char|Result]);
-remove_zeros([], Result) ->
-    Result.
-
-%% Tests integer_to_list/1.
-
-t_integer_to_list(Config) when is_list(Config) ->
-    "0" = integer_to_list(0),
-    "42" = integer_to_list(42),
-    "-42" = integer_to_list(-42),
-    "-42" = integer_to_list(-42),
-    "32768" = integer_to_list(32768),
-    "268435455" = integer_to_list(268435455),
-    "-268435455" = integer_to_list(-268435455),
-    "123456932798748738738" = integer_to_list(123456932798748738738),
-    Big_List = lists:duplicate(2000, $1),
-    Big = list_to_integer(Big_List),
-    Big_List = integer_to_list(Big),
-    ok.
-
-%% Tests list_to_float/1.
-
-
-t_list_to_float_safe(Config) when is_list(Config) ->
-    0.0 = list_to_float("0.0"),
-    0.0 = list_to_float("-0.0"),
-    0.5 = list_to_float("0.5"),
-    -0.5 = list_to_float("-0.5"),
-    100.0 = list_to_float("1.0e2"),
-    127.5 = list_to_float("127.5"),
-    -199.5 = list_to_float("-199.5"),
-
-    {'EXIT', {badarg, _}} = (catch list_to_float("0")),
-    {'EXIT', {badarg, _}} = (catch list_to_float("0..0")),
-    {'EXIT', {badarg, _}} = (catch list_to_float("0e12")),
-    {'EXIT', {badarg, _}} = (catch list_to_float("--0.0")),
-%%    {'EXIT', {badarg, _}} = (catch list_to_float("0.0e+99999999")),
-
-    ok.
-
-%% This might crash the emulator...
-%% (Known to crash the Unix version of Erlang 4.4.1)
-
-t_list_to_float_risky(Config) when is_list(Config) ->
-    Many_Ones = lists:duplicate(25000, $1),
-    _ = list_to_float("2."++Many_Ones),
-    {'EXIT', {badarg, _}} = (catch list_to_float("2"++Many_Ones)),
-    ok.
-
-%% Tests list_to_integer/1.
-
-t_list_to_integer(Config) when is_list(Config) ->
-    0 = list_to_integer("0"),
-    0 = list_to_integer("00"),
-    0 = list_to_integer("-0"),
-    1 = list_to_integer("1"),
-    -1 = list_to_integer("-1"),
-    42 = list_to_integer("42"),
-    -12 = list_to_integer("-12"),
-    32768 = list_to_integer("32768"),
-    268435455 = list_to_integer("268435455"),
-    -268435455 = list_to_integer("-268435455"),
-
-    %% Bignums.
-    123456932798748738738 = list_to_integer("123456932798748738738"),
-    _ = list_to_integer(lists:duplicate(2000, $1)),
-    ok.
-
-%% Tests round/1.
-
-t_round(Config) when is_list(Config) ->
-    0 = round(0.0),
-    0 = round(0.4),
-    1 = round(0.5),
-    0 = round(-0.4),
-    -1 = round(-0.5),
-    255 = round(255.3),
-    256 = round(255.6),
-    -1033 = round(-1033.3),
-    -1034 = round(-1033.6),
-    
-    % OTP-3722:
-    X = (1 bsl 27) - 1,
-    MX = -X,
-    MXm1 = -X-1,
-    MXp1 = -X+1,
-    F = X + 0.0,
-    X = round(F),
-    X = round(F+1)-1,
-    X = round(F-1)+1,
-    MX = round(-F),
-    MXm1 = round(-F-1),
-    MXp1 = round(-F+1),
-
-    X = round(F+0.1),
-    X = round(F+1+0.1)-1,
-    X = round(F-1+0.1)+1,
-    MX = round(-F+0.1),
-    MXm1 = round(-F-1+0.1),
-    MXp1 = round(-F+1+0.1),
-
-    X = round(F-0.1),
-    X = round(F+1-0.1)-1,
-    X = round(F-1-0.1)+1,
-    MX = round(-F-0.1),
-    MXm1 = round(-F-1-0.1),
-    MXp1 = round(-F+1-0.1),
-
-    0.5 = abs(round(F+0.5)-(F+0.5)),
-    0.5 = abs(round(F-0.5)-(F-0.5)),
-    0.5 = abs(round(-F-0.5)-(-F-0.5)),
-    0.5 = abs(round(-F+0.5)-(-F+0.5)),
-
-    %% Bignums.
-    4294967296 = round(4294967296.1),
-    4294967297 = round(4294967296.9),
-    -4294967296 = -round(4294967296.1),
-    -4294967297 = -round(4294967296.9),
-    ok.
-
-t_trunc(Config) when is_list(Config) ->
-    0 = trunc(0.0),
-    5 = trunc(5.3333),
-    -10 = trunc(-10.978987),
-    % The largest smallnum, converted to float (OTP-3722):
-    X = (1 bsl 27) - 1,
-    F = X + 0.0,
-    io:format("X = ~p/~w/~w, F = ~p/~w/~w, trunc(F) = ~p/~w/~w~n",
-	      [X, X, binary_to_list(term_to_binary(X)),
-	       F, F, binary_to_list(term_to_binary(F)),
-	       trunc(F), trunc(F), binary_to_list(term_to_binary(trunc(F)))]),
-    X = trunc(F),
-    X = trunc(F+1)-1,
-    X = trunc(F-1)+1,
-    X = -trunc(-F),
-    X = -trunc(-F-1)-1,
-    X = -trunc(-F+1)+1,
-
-    %% Bignums.
-    4294967305 = trunc(4294967305.7),
-    -4294967305 = trunc(-4294967305.7),
-    ok.