[PATCH] sim: tests: support .S files

[PATCH] sim: tests: support .S files

[Mike Frysinger]

From: Jie Zhang <jie@codesourcery.com>

Rather than requiring all sim tests to be preprocessed .s files, add
support for .S files so we can easily write code using normal CPP
defines/macros.

Signed-off-by: Jie Zhang <jie@codesourcery.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 sim/testsuite/lib/sim-defs.exp |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index 1e65817..eacdf76 100644
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -310,7 +310,18 @@ proc run_sim_test { name requested_machs } {
 	if [info exists cpu_option] {
 	    set as_options "$as_options $cpu_option=$mach"
 	}
-	set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
+	if [string match "*.S" $sourcefile] {
+	    set comp_output [target_compile $sourcefile ${name}.s "preprocess" "incdir=$srcdir/$subdir"]
+	    if ![string match "" $comp_output] {
+		verbose -log "$comp_output" 3
+		fail "$mach $testname (preprocessing)"
+		continue
+	    }
+	    set comp_output [target_assemble ${name}.s ${name}.o "$as_options $global_as_options"]
+	    file delete ${name}.s
+	} else {
+	    set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
+	}
 
 	if ![string match "" $comp_output] {
 	    verbose -log "$comp_output" 3
-- 
1.7.4.1

Re: [PATCH] sim: tests: support .S files

[Pedro Alves]

On Sunday 13 March 2011 23:10:48, Mike Frysinger wrote:
> -       set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
> +       if [string match "*.S" $sourcefile] {
> +           set comp_output [target_compile $sourcefile ${name}.s "preprocess" "incdir=$srcdir/$subdir"]
> +           if ![string match "" $comp_output] {
> +               verbose -log "$comp_output" 3
> +               fail "$mach $testname (preprocessing)"
> +               continue
> +           }
> +           set comp_output [target_assemble ${name}.s ${name}.o "$as_options $global_as_options"]
> +           file delete ${name}.s
> +       } else {
> +           set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
> +       }
>  

When using srcdir==buildir, won't this overwrite the source file on
non case-sensitive filesystems?

-- 
Pedro Alves

Re: [PATCH] sim: tests: support .S files

[Mike Frysinger]

[-- Attachment #1: Type: Text/Plain, Size: 1244 bytes --]

On Monday, March 14, 2011 07:56:23 Pedro Alves wrote:
> On Sunday 13 March 2011 23:10:48, Mike Frysinger wrote:
> > -       set comp_output [target_assemble $sourcefile ${name}.o
> > "$as_options $global_as_options"]
> > +       if [string match "*.S" $sourcefile] {
> > +           set comp_output [target_compile $sourcefile ${name}.s
> > "preprocess" "incdir=$srcdir/$subdir"]
> > +           if ![string match "" $comp_output] {
> > +               verbose -log "$comp_output" 3
> > +               fail "$mach $testname (preprocessing)"
> > +               continue
> > +           }
> > +           set comp_output [target_assemble ${name}.s ${name}.o
> > "$as_options $global_as_options"]
> > +           file delete ${name}.s
> > +       } else {
> > +           set comp_output [target_assemble $sourcefile ${name}.o
> > "$as_options $global_as_options"]
> > +       }
> 
> When using srcdir==buildir, won't this overwrite the source file on
> non case-sensitive filesystems?

picking any diff named file runs the risk of collision.  i have a local patch 
to follow this up to add support for .c files too, but i guess i'll just fold 
them into one since the .c step goes .c -> .o without the .s step.
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH] sim: tests: support .S/.c files

[Mike Frysinger]

Rather than requiring all sim tests to be preprocessed .s files, add
support for .S and .c files so we can easily write code using a higher
level language like C.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

2011-03-14  Mike Frysinger  <vapier@gentoo.org>

	* sim-defs.exp: Support cc tag in test files.
	(run_sim_test): Support global_cc_options in boards files.  Convert
	assembler options into compiler options (c_as_options) with -Wa.
	Convert linker options into compiler options (c_ld_options) with -Wl.
	Compile .c and .S files into .x programs.
---
 sim/testsuite/lib/sim-defs.exp |   48 ++++++++++++++++++++++++++++++++-------
 1 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index 1e65817..c8093a2 100644
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -169,6 +169,7 @@ proc sim_run { prog sim_opts prog_opts redir options } {
 # mach: [all | machine names]
 # as[(mach-list)]: <assembler options>
 # ld[(mach-list)]: <linker options>
+# cc[(mach-list)]: <compiler options>
 # sim[(mach-list)]: <simulator options>
 # progopts: <arguments to the program being simulated>
 # output: program output pattern to match with string-match
@@ -190,6 +191,7 @@ proc run_sim_test { name requested_machs } {
     global cpu_option
     global global_as_options
     global global_ld_options
+    global global_cc_options
     global global_sim_options
 
     if [string match "*/*" $name] {
@@ -207,6 +209,7 @@ proc run_sim_test { name requested_machs } {
     # Clear default options
     set opts(as) ""
     set opts(ld) ""
+    set opts(cc) ""
     set opts(progopts) ""
     set opts(sim) ""
     set opts(output) ""
@@ -222,6 +225,9 @@ proc run_sim_test { name requested_machs } {
     if ![info exists global_ld_options] {
         set global_ld_options ""
     }
+    if ![info exists global_cc_options] {
+        set global_cc_options ""
+    }
     if ![info exists global_sim_options] {
         set global_sim_options ""
     }
@@ -234,6 +240,9 @@ proc run_sim_test { name requested_machs } {
 	if [info exists opts(ld,$m)] {
 	    unset opts(ld,$m)
 	}
+	if [info exists opts(cc,$m)] {
+	    unset opts(cc,$m)
+	}
 	if [info exists opts(sim,$m)] {
 	    unset opts(sim,$m)
 	}
@@ -310,23 +319,44 @@ proc run_sim_test { name requested_machs } {
 	if [info exists cpu_option] {
 	    set as_options "$as_options $cpu_option=$mach"
 	}
-	set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
-
-	if ![string match "" $comp_output] {
-	    verbose -log "$comp_output" 3
-	    fail "$mach $testname (assembling)"
-	    continue
-	}
+	regsub {(^ *| +)([^ ]+)} "$as_options $global_as_options" { -Wa,\2} c_as_options
 
 	if ![info exists opts(ld,$mach)] {
 	    set opts(ld,$mach) $opts(ld)
 	}
+	regsub {(^ *| +)([^ ]+)} "$opts(ld,$mach) $global_ld_options" { -Wl,\2} c_ld_options
+
+	if ![info exists opts(cc,$mach)] {
+	    set opts(cc,$mach) $opts(cc)
+	}
+
+	if [string match "*.c" $sourcefile] {
+	    set comp_output [target_compile $sourcefile ${name}.x "executable" \
+		[list "incdir=$srcdir/$subdir" "additional_flags=$c_as_options $c_ld_options $opts(cc,$mach) $global_cc_options"]]
+	    set method "compiling/linking"
+	} else {
+	    if [string match "*.S" $sourcefile] {
+		set comp_output [target_compile $sourcefile ${name}.o "object" \
+		    [list "incdir=$srcdir/$subdir" "additional_flags=$c_as_options"]]
+		set method "compiling"
+	    } else {
+		set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
+		set method "assembling"
+	    }
+
+	    if ![string match "" $comp_output] {
+		verbose -log "$comp_output" 3
+		fail "$mach $testname (${method})"
+		continue
+	    }
 
-	set comp_output [target_link ${name}.o ${name}.x "$opts(ld,$mach) $global_ld_options"]
+	    set comp_output [target_link ${name}.o ${name}.x "$opts(ld,$mach) $global_ld_options"]
+	    set method "linking"
+	}
 
 	if ![string match "" $comp_output] {
 	    verbose -log "$comp_output" 3
-	    fail "$mach $testname (linking)"
+	    fail "$mach $testname (${method})"
 	    continue
 	}
 
-- 
1.7.4.1

Re: [PATCH] sim: tests: support .S/.c files

[Mike Frysinger]

On Mon, Mar 14, 2011 at 5:06 PM, Mike Frysinger wrote:
> Rather than requiring all sim tests to be preprocessed .s files, add
> support for .S and .c files so we can easily write code using a higher
> level language like C.

ping ...

once this guy is in, i can start merging the giant Blackfin testsuite
dir.  although not strictly necessary, but .S/.c files make up about a
quarter of our tests (~800 and counting).
-mike

Re: [PATCH] sim: tests: support .S/.c files

[Joel Brobecker]

> 2011-03-14  Mike Frysinger  <vapier@gentoo.org>
> 
> 	* sim-defs.exp: Support cc tag in test files.
> 	(run_sim_test): Support global_cc_options in boards files.  Convert
> 	assembler options into compiler options (c_as_options) with -Wa.
> 	Convert linker options into compiler options (c_ld_options) with -Wl.
> 	Compile .c and .S files into .x programs.

Sorry for the delay in reviewing.

> -	set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
> -
> -	if ![string match "" $comp_output] {
> -	    verbose -log "$comp_output" 3
> -	    fail "$mach $testname (assembling)"
> -	    continue
> -	}
> +	regsub {(^ *| +)([^ ]+)} "$as_options $global_as_options" { -Wa,\2} c_as_options
>  
>  	if ![info exists opts(ld,$mach)] {
>  	    set opts(ld,$mach) $opts(ld)
>  	}
> +	regsub {(^ *| +)([^ ]+)} "$opts(ld,$mach) $global_ld_options" { -Wl,\2} c_ld_options
> +
> +	if ![info exists opts(cc,$mach)] {
> +	    set opts(cc,$mach) $opts(cc)
> +	}
> +
> +	if [string match "*.c" $sourcefile] {
> +	    set comp_output [target_compile $sourcefile ${name}.x "executable" \
> +		[list "incdir=$srcdir/$subdir" "additional_flags=$c_as_options $c_ld_options $opts(cc,$mach) $global_cc_options"]]
> +	    set method "compiling/linking"
> +	} else {
> +	    if [string match "*.S" $sourcefile] {
> +		set comp_output [target_compile $sourcefile ${name}.o "object" \
> +		    [list "incdir=$srcdir/$subdir" "additional_flags=$c_as_options"]]
> +		set method "compiling"
> +	    } else {
> +		set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
> +		set method "assembling"
> +	    }
> +
> +	    if ![string match "" $comp_output] {
> +		verbose -log "$comp_output" 3
> +		fail "$mach $testname (${method})"
> +		continue
> +	    }

It looks like you are not checking the output from the compilation
of .c files, while you kept that check for all other files. Is that
intentional?

-- 
Joel

Re: [PATCH] sim: tests: support .S/.c files

[Mike Frysinger]

On Wed, Mar 23, 2011 at 12:42 PM, Joel Brobecker wrote:
>> -     set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
>> -
>> -     if ![string match "" $comp_output] {
>> -         verbose -log "$comp_output" 3
>> -         fail "$mach $testname (assembling)"
>> -         continue
>> -     }
>> +     regsub {(^ *| +)([^ ]+)} "$as_options $global_as_options" { -Wa,\2} c_as_options
>>
>>       if ![info exists opts(ld,$mach)] {
>>           set opts(ld,$mach) $opts(ld)
>>       }
>> +     regsub {(^ *| +)([^ ]+)} "$opts(ld,$mach) $global_ld_options" { -Wl,\2} c_ld_options
>> +
>> +     if ![info exists opts(cc,$mach)] {
>> +         set opts(cc,$mach) $opts(cc)
>> +     }
>> +
>> +     if [string match "*.c" $sourcefile] {
>> +         set comp_output [target_compile $sourcefile ${name}.x "executable" \
>> +             [list "incdir=$srcdir/$subdir" "additional_flags=$c_as_options $c_ld_options $opts(cc,$mach) $global_cc_options"]]
>> +         set method "compiling/linking"
>> +     } else {
>> +         if [string match "*.S" $sourcefile] {
>> +             set comp_output [target_compile $sourcefile ${name}.o "object" \
>> +                 [list "incdir=$srcdir/$subdir" "additional_flags=$c_as_options"]]
>> +             set method "compiling"
>> +         } else {
>> +             set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
>> +             set method "assembling"
>> +         }
>> +
>> +         if ![string match "" $comp_output] {
>> +             verbose -log "$comp_output" 3
>> +             fail "$mach $testname (${method})"
>> +             continue
>> +         }
>
> It looks like you are not checking the output from the compilation
> of .c files, while you kept that check for all other files. Is that
> intentional?

i dont think so ... actual build failures would still be caught we
would try to run it.  i'll see if link time warnings cause a problem.
there should at least be a comment in here if the behavior is
intended.
-mike

Re: [PATCH] sim: tests: support .S/.c files

[Mike Frysinger]

On Wed, Mar 23, 2011 at 12:42 PM, Joel Brobecker wrote:
>> -     set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
>> -
>> -     if ![string match "" $comp_output] {
>> -         verbose -log "$comp_output" 3
>> -         fail "$mach $testname (assembling)"
>> -         continue
>> -     }
>> +     regsub {(^ *| +)([^ ]+)} "$as_options $global_as_options" { -Wa,\2} c_as_options
>>
>>       if ![info exists opts(ld,$mach)] {
>>           set opts(ld,$mach) $opts(ld)
>>       }
>> +     regsub {(^ *| +)([^ ]+)} "$opts(ld,$mach) $global_ld_options" { -Wl,\2} c_ld_options
>> +
>> +     if ![info exists opts(cc,$mach)] {
>> +         set opts(cc,$mach) $opts(cc)
>> +     }
>> +
>> +     if [string match "*.c" $sourcefile] {
>> +         set comp_output [target_compile $sourcefile ${name}.x "executable" \
>> +             [list "incdir=$srcdir/$subdir" "additional_flags=$c_as_options $c_ld_options $opts(cc,$mach) $global_cc_options"]]
>> +         set method "compiling/linking"
>> +     } else {
>> +         if [string match "*.S" $sourcefile] {
>> +             set comp_output [target_compile $sourcefile ${name}.o "object" \
>> +                 [list "incdir=$srcdir/$subdir" "additional_flags=$c_as_options"]]
>> +             set method "compiling"
>> +         } else {
>> +             set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
>> +             set method "assembling"
>> +         }
>> +
>> +         if ![string match "" $comp_output] {
>> +             verbose -log "$comp_output" 3
>> +             fail "$mach $testname (${method})"
>> +             continue
>> +         }
>
> It looks like you are not checking the output from the compilation
> of .c files, while you kept that check for all other files. Is that
> intentional?

mmm, that's not the case after all.  if you look at the wider context,
the .c statement will fall down to the *next* comp_output branch.

old code was basically:
- assemble
- check
- link
- check

new code is:
if (*.c) {
  - compile & link
} else {
  if (*.S) {
    - compile
  } else {
    - assemble
  }
  - check
  - link
}
-check

so that intended check isnt "removed" from the .c step, it's simply
made obsolete because the compiler driver (i.e. gcc) is allowed to
compile/link in one shot.
-mike

Re: [PATCH] sim: tests: support .S/.c files

[Mike Frysinger]

On Mon, Mar 14, 2011 at 5:06 PM, Mike Frysinger wrote:
> Rather than requiring all sim tests to be preprocessed .s files, add
> support for .S and .c files so we can easily write code using a higher
> level language like C.

these targets do not build for me:
 cr16 d10v erc32 mcore

for those that build, these fail tests before my patch:
 m32r sh64

the rest pass before and after my patch:
 arm avr bfin cris frv h8300 iq2000 lm32 m32c m32r m68hc11 microblaze
mips mn10300 moxie ppc rx sh sh64 v850
-mike

Re: [PATCH] sim: tests: support .S/.c files

[Mike Frysinger]

[-- Attachment #1: Type: Text/Plain, Size: 242 bytes --]

On Monday, March 14, 2011 17:06:09 Mike Frysinger wrote:
> Rather than requiring all sim tests to be preprocessed .s files, add
> support for .S and .c files so we can easily write code using a higher
> level language like C.

ping ...
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] sim: tests: support .S/.c files

[Joel Brobecker]

> On Monday, March 14, 2011 17:06:09 Mike Frysinger wrote:
> > Rather than requiring all sim tests to be preprocessed .s files, add
> > support for .S and .c files so we can easily write code using a higher
> > level language like C.
> 
> ping ...

As far as I can tell, you answered the only concern I had left,
so please go ahead. Sorry about the delay - I accidently dropped
the ball there, somehow thinking the infamous somebody was already
following that thread.

-- 
Joel

Re: [PATCH] sim: tests: support .S/.c files

[Mike Frysinger]

[-- Attachment #1: Type: Text/Plain, Size: 683 bytes --]

On Monday, May 16, 2011 14:36:43 Joel Brobecker wrote:
> > On Monday, March 14, 2011 17:06:09 Mike Frysinger wrote:
> > > Rather than requiring all sim tests to be preprocessed .s files, add
> > > support for .S and .c files so we can easily write code using a higher
> > > level language like C.
> > 
> > ping ...
> 
> As far as I can tell, you answered the only concern I had left,
> so please go ahead. Sorry about the delay - I accidently dropped
> the ball there, somehow thinking the infamous somebody was already
> following that thread.

np ... i know you were busy with the gdb branching, so i didnt want to hassle 
you further until that settled down
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]