diff options
| author | Frej Drejhammar <frej@sics.se> | 2020-03-13 12:05:37 +0100 |
|---|---|---|
| committer | Frej Drejhammar <frej@sics.se> | 2020-03-13 13:06:19 +0100 |
| commit | 33f8dddd1eb7e96c1ac99fed93571bce51dab8c7 (patch) | |
| tree | a8fc22519825a5d2d09d8fbc9d55ed8c1a9139e4 /scripts | |
| parent | 30e2bfb9f1fd5c65bd7d9a4159f88cdcf72023fa (diff) | |
| download | erlang-33f8dddd1eb7e96c1ac99fed93571bce51dab8c7.tar.gz | |
scripts/diffable: Add option for compiling with +deterministic
This patch adds a new `--deterministic` command line flag to the
diffable script. When enabled, diffable compiles files with the
`deterministic` compiler option enabled. As deterministic compilation
results in line directives only containing the basename of module
files, this greatly reduces the size of diffs when comparing the
results from different build and source trees.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/diffable | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/scripts/diffable b/scripts/diffable index b5f6756687..671538a00d 100755 --- a/scripts/diffable +++ b/scripts/diffable @@ -7,7 +7,7 @@ -define(LONG_COMPILE_THRESHOLD, 10000). main(Args0) -> - DefOpts = #{format=>asm,no_compile=>false,legacy=>false}, + DefOpts = #{format=>asm,no_compile=>false,legacy=>false,deterministic=>[]}, {Args,Opts} = opts(Args0, DefOpts), case Args of [OutDir] -> @@ -19,10 +19,12 @@ main(Args0) -> usage() -> S = ["usage: otp-diffable-asm [OPTION] DIRECTORY\n\n" "Options:\n" - " --asm Output to .S files (default)\n" - " --legacy-asm Output to legacy .S files\n" - " --dis Output to .dis files\n" - " --no-compile Disassemble from BEAM files (use with --dis)\n" + " --asm Output to .S files (default)\n" + " --legacy-asm Output to legacy .S files\n" + " --dis Output to .dis files\n" + " --no-compile Disassemble from BEAM files (use with --dis)\n" + " --deterministic Compile with +deterministic (useful when comparing" + " output from different build trees using --asm)" "\n" "DESCRIPTION\n" "\n" @@ -82,6 +84,8 @@ opt("legacy-asm", Opts) -> Opts#{format:=asm,legacy:=true}; opt("no-compile", Opts) -> Opts#{format:=dis,no_compile:=true}; +opt("deterministic", Opts) -> + Opts#{deterministic:=[deterministic]}; opt(Opt, _Opts) -> io:format("Uknown option: --~ts\n\n", [Opt]), usage(). @@ -260,10 +264,11 @@ get_beams([]) -> []. compile_to_asm_fun(#{outdir:=OutDir}=Opts) -> fun(Spec) -> Legacy = map_get(legacy, Opts), - compile_to_asm(Spec, OutDir, Legacy) + Deterministic = map_get(deterministic, Opts), + compile_to_asm(Spec, OutDir, Legacy, Deterministic) end. -compile_to_asm({Beam,elixir}, OutDir, _Legacy) -> +compile_to_asm({Beam,elixir}, OutDir, _Legacy, _Deterministic) -> Abst = get_abstract_from_beam(Beam), Source = filename:rootname(Beam, ".beam"), Opts = [diffable,{outdir,OutDir},report_errors,{source,Source}], @@ -273,8 +278,9 @@ compile_to_asm({Beam,elixir}, OutDir, _Legacy) -> error -> error end; -compile_to_asm({File,Opts}, OutDir, Legacy) -> - case compile:file(File, [diffable,{outdir,OutDir},report_errors|Opts]) of +compile_to_asm({File,Opts0}, OutDir, Legacy, Deterministic) -> + Opts = Deterministic ++ [diffable,{outdir,OutDir},report_errors|Opts0], + case compile:file(File, Opts) of {ok,_Mod} -> case Legacy of true -> |