clearlinux/make-fmv-patch
2
0
Fork 0
mirror of https://github.com/clearlinux/make-fmv-patch.git synced 2026-08-18 20:15:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make target-conf emit single line

Browse Source 
target.conf currently causes three lines to be emitted. With some
preprocessor defines we can make it just one, plus header.
This commit is contained in:
Artoria2e5
2022-05-27 10:04:05 +08:00
committed by William Douglas
parent 831ace4f30
commit 0428fa0cac
3 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -9
View File
@@ -77,15 +77,7 @@ The command generates the following example.c.patch patch:
int i,x;
```
If you want to use a different target for your code you can create a file targets.conf
For example
```
#if defined(i386__) || defined(__i386__) || defined(_M_IX86) || defined(_M_IX86) || defined(__X86__) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_AMD64)
__attribute__((target_clones("avx2","arch=haswell","default")))
#endif
```
If you want to use a different target for your code you can create a file `targets.conf`. See `targets.conf.txt` for an example.
### 3. Apply the patch
Using the example.c.patch file, apply the patch to example.c:
make-fmv-patch.pl
+13 -15
View File
@@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
# This program will make its best effort on finding the candidates sources for FMV
# patch them and create a bunch of ready to apply patches.
@@ -32,39 +31,37 @@ my ($log_file, $source_path) = @ARGV;
sub patch_function {
my $attribute = "";
my $attribute = '__attribute__((target_clones(FMV_CLONE_TARGETS "default")))' . "\n";
my $head = '#define FMV_CLONE_TARGETS "avx2","arch=atom",' . "\n";
my $target_clones = 'targets.conf';
if (-e $target_clones) {
open(my $fh, '<:encoding(UTF-8)', $target_clones)
or die "Could not open file '$target_clones' $!";
open(my $fh, '<:encoding(UTF-8)', $target_clones) or die "Could not open file '$target_clones' $!";
while (my $row = <$fh>) {
chomp $row;
$attribute= $attribute.$row."\n";
$head = $head . $row . "\n";
}
}else {
$attribute = '__attribute__((target_clones("avx2","arch=atom","default")))'."\n";
}
my ($file,@patch_line) = @_;
my $patch_file = "$file"."~";
my ($file, @patch_line) = @_;
my $patch_file = "$file" . "~";
print "patching $file @ lines \(@patch_line\)\n";
open(my $in, "<", $file) or die "$! - $file\n";
open(my $out, ">","$patch_file") or die __LINE__," - $!\n";
open(my $out, ">", "$patch_file") or die __LINE__, " - $!\n";
print $head;
foreach (@patch_line) {
my $line_num = $_;
my $line_num = $_;
while( <$in> ) {
while (<$in>) {
print $out $_;
last if $. == ($line_num - 1);
}
print $out $attribute;
}
while( <$in> ) {
while (<$in>) {
print $out $_;
}
@@ -72,11 +69,12 @@ sub patch_function {
close $in;
my $diff = `diff -su $file $patch_file`;
open (my $d,">","$file.patch") or die __LINE__," - $!\n";
open(my $d, ">", "$file.patch") or die __LINE__, " - $!\n";
print $d $diff;
close($d);
`rm $patch_file`;
}
sub find_file {
my ($file) = @_;
targets.conf.txt
+4 -2
View File
@@ -1,3 +1,5 @@
#if defined(i386__) || defined(__i386__) || defined(_M_IX86) || defined(_M_IX86) || defined(__X86__) || defined(_X86_) || defined(__I86__) || defined(__INTEL__) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_AMD64)
__attribute__((target_clones("avx2","arch=haswell","default")))
#if defined(__i386__) || defined(__x86_64__)
#define FMV_CLONE_TARGETS "avx2","arch=haswell",
#else
#define FMV_CLONE_TARGETS
#endif