pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ahir: added tool llvm2aa, with appropriate patches
Module Name: pkgsrc-wip
Committed By: Mayuresh <mayuresh%acm.org@localhost>
Pushed By: mayuresh
Date: Fri Oct 3 20:46:25 2025 +0530
Changeset: 31ebad14190e6554f6727102fcd8f022e53cf5a4
Modified Files:
ahir/Makefile
ahir/PLIST
ahir/distinfo
Added Files:
ahir/patches/patch-v2_AaGeneration_src_AaWriter.cpp
ahir/patches/patch-v2_AaGeneration_src_Utils.cpp
Log Message:
ahir: added tool llvm2aa, with appropriate patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=31ebad14190e6554f6727102fcd8f022e53cf5a4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ahir/Makefile | 12 +++--
ahir/PLIST | 1 +
ahir/distinfo | 11 +++--
.../patches/patch-v2_AaGeneration_src_AaWriter.cpp | 21 +++++++++
ahir/patches/patch-v2_AaGeneration_src_Utils.cpp | 54 ++++++++++++++++++++++
5 files changed, 93 insertions(+), 6 deletions(-)
diffs:
diff --git a/ahir/Makefile b/ahir/Makefile
index 886db1046e..9359940efb 100644
--- a/ahir/Makefile
+++ b/ahir/Makefile
@@ -1,23 +1,24 @@
# $NetBSD$
-DISTNAME= ahir-0.0.0.1609
+DISTNAME= ahir-0.0.0.1610
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=mayureshw/}
GITHUB_PROJECT= ahir
-GITHUB_TAG= d0c06f7
+GITHUB_TAG= 5e583cb5f2d7c89925abd116a97da7a1e257312b
DIST_SUBDIR= ${GITHUB_PROJECT}
GITHUB_SUBMODULES+= mayureshw vctools 5ca442d ../vctools
GITHUB_SUBMODULES+= mayureshw petrisimu 1baebbe ../petrisimu
GITHUB_SUBMODULES+= mayureshw ceptool 61f00c7 ../ceptool
GITHUB_SUBMODULES+= mayureshw xsbcppif 3a96d2b ../xsbcppif
+GITHUB_SUBMODULES+= rutujaekatpure AaGeneration caf8a9d v2/AaGeneration
MAINTAINER= mayuresh%acm.org@localhost
HOMEPAGE= https://github.com/mayureshw/ahir/
COMMENT= High-Level Synthesis toolset from C to VHDL
#LICENSE= Requested adding University of Illinois/NCSA Open Source License on pkgsrc mailing list
-AHIRDIR= ${WRKDIR}/ahir-d0c06f712ecb6f03c007c17c714aac9d8ee8c12e
+AHIRDIR= ${WRKDIR}/ahir-${GITHUB_TAG}
BUILD_DIRS+= ${AHIRDIR}/v2
BUILD_DIRS+= ${WRKDIR}/vctools
USE_LANGUAGES= c c++
@@ -34,8 +35,13 @@ MAKE_ENV+= XSBCPPIFDIR=${WRKDIR}/xsbcppif
PKG_JVMS_ACCEPTED= openjdk21 openjdk-bin
+# AaGeneration duplicates the header. Once the two upstreams merge, this can be removed
+post-extract:
+ ${RM} -f ${AHIRDIR}/v2/AaGeneration/include/BGLWrap.hpp
+
.include "../../wip/xsb/buildlink3.mk"
.include "../../wip/antlr/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../lang/llvm/buildlink3.mk"
.include "../../mk/java-vm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ahir/PLIST b/ahir/PLIST
index e98da6acf1..b97c858ac4 100644
--- a/ahir/PLIST
+++ b/ahir/PLIST
@@ -10,6 +10,7 @@ bin/hierSysCheck
bin/hierSysGenVhdlComponentsPackage
bin/hierSysPartition
bin/hierSysUniquify
+bin/llvm2aa
bin/vc2vhdl
bin/vcAnalyze
bin/vcFormat
diff --git a/ahir/distinfo b/ahir/distinfo
index a965c90110..27cb7535e2 100644
--- a/ahir/distinfo
+++ b/ahir/distinfo
@@ -1,8 +1,8 @@
$NetBSD$
-BLAKE2s (ahir/ahir-0.0.0.1609-d0c06f7.tar.gz) = de064fcf33c5d03e1de63b2cbe7f311e6c6e428744add4ab3422f10dcc95b134
-SHA512 (ahir/ahir-0.0.0.1609-d0c06f7.tar.gz) = 5ec06e4cdfc3959a8f44e83d014feba6fcf886a3f918e1807d8afdd23b2a8d66672c3be6978c15b99a730105a488800fdc5e57defbd0e1e06cc1edc57d5ec6ae
-Size (ahir/ahir-0.0.0.1609-d0c06f7.tar.gz) = 98786105 bytes
+BLAKE2s (ahir/ahir-0.0.0.1610-5e583cb5f2d7c89925abd116a97da7a1e257312b.tar.gz) = ab0a86c362a0045886e648fcc28ae7de2ea0b8fab1ad20d7d70c756fa7fd9f72
+SHA512 (ahir/ahir-0.0.0.1610-5e583cb5f2d7c89925abd116a97da7a1e257312b.tar.gz) = e1bda6c4985a763d988d5e7679aff71af17501823ed839361b58b3c40bc38799548d92885ec2fa0ba969177a4d1744411229660a233268c125ad05dc24ea9599
+Size (ahir/ahir-0.0.0.1610-5e583cb5f2d7c89925abd116a97da7a1e257312b.tar.gz) = 98788074 bytes
BLAKE2s (ahir/mayureshw-ceptool-61f00c7.tar.gz) = b8b1b4aa5ac8fa237b2a925930ef9b12525c854e5e4e3e3aceb42dc9e90a300a
SHA512 (ahir/mayureshw-ceptool-61f00c7.tar.gz) = 188e98c6578307fb91d34a5e514a33190a9368755e7421115a843d668a79663fa75bdb0765789243a69b84792568090459fe29f3cff1ce8b98987b9bf51eb4eb
Size (ahir/mayureshw-ceptool-61f00c7.tar.gz) = 14192 bytes
@@ -15,3 +15,8 @@ Size (ahir/mayureshw-vctools-5ca442d.tar.gz) = 80090 bytes
BLAKE2s (ahir/mayureshw-xsbcppif-3a96d2b.tar.gz) = c61c74f1016081bf7047f3579ea3917a4ea7aa65bc7a6c8bf726fdf494091424
SHA512 (ahir/mayureshw-xsbcppif-3a96d2b.tar.gz) = a584648b76bdd57874de5bfcd1b6fae5cfa908e5e9808adb3e26fc78f99f2600a685de0c23ad99d29b6192343315fe76678f535e2bceeced889883ac4a4d8ab2
Size (ahir/mayureshw-xsbcppif-3a96d2b.tar.gz) = 7018 bytes
+BLAKE2s (ahir/rutujaekatpure-AaGeneration-caf8a9d.tar.gz) = dbe3c62d98d35efa11780a078551074d5fe8f4f34abaf75a09eda71b74ec8ece
+SHA512 (ahir/rutujaekatpure-AaGeneration-caf8a9d.tar.gz) = c4e5be91a83db3667d9d2d716f773ed3562a24b9d2e0d89506a8412e4aad093bdde723fb3beadd5db5f8e5306a6eb8b0fca74ae21a7714ec7408b5913f4986cd
+Size (ahir/rutujaekatpure-AaGeneration-caf8a9d.tar.gz) = 129810 bytes
+SHA1 (patch-v2_AaGeneration_src_AaWriter.cpp) = 131377e91116a4c07ebfd599d581130319a81a4d
+SHA1 (patch-v2_AaGeneration_src_Utils.cpp) = ec99e2f12bb6e4725e509a8c28056e92625cc5c4
diff --git a/ahir/patches/patch-v2_AaGeneration_src_AaWriter.cpp b/ahir/patches/patch-v2_AaGeneration_src_AaWriter.cpp
new file mode 100644
index 0000000000..d62bedb54e
--- /dev/null
+++ b/ahir/patches/patch-v2_AaGeneration_src_AaWriter.cpp
@@ -0,0 +1,21 @@
+$NetBSD$
+
+llvm 17 to 19 migration, patch shared upstream
+
+--- v2/AaGeneration/src/AaWriter.cpp.orig 2025-09-12 13:36:48.000000000 +0000
++++ v2/AaGeneration/src/AaWriter.cpp
+@@ -1443,12 +1443,12 @@ namespace {
+ if(called_function != NULL)
+ {
+ StringRef fname = called_function->getName();
+- if(fname.equals("__loop_pipelining_on__"))
++ if(fname == "__loop_pipelining_on__")
+ {
+ std::cerr << "Info: ignoring call to special function __loop_pipelining_on__." << std::endl;
+ return;
+ }
+- if(fname.equals("__aa_barrier__"))
++ if(fname == "__aa_barrier__")
+ {
+ std::cerr << "Info: saw special function __aa_barrier__." << std::endl;
+ std::cout << "$barrier " << std::endl;
diff --git a/ahir/patches/patch-v2_AaGeneration_src_Utils.cpp b/ahir/patches/patch-v2_AaGeneration_src_Utils.cpp
new file mode 100644
index 0000000000..d4d20abec9
--- /dev/null
+++ b/ahir/patches/patch-v2_AaGeneration_src_Utils.cpp
@@ -0,0 +1,54 @@
+$NetBSD$
+
+llvm 17 to 19 migration, patch shared upstream
+
+--- v2/AaGeneration/src/Utils.cpp.orig 2025-09-12 13:36:48.000000000 +0000
++++ v2/AaGeneration/src/Utils.cpp
+@@ -411,22 +411,22 @@ IOCode Aa::get_io_code(CallInst &C)
+ // return NOT_IO;
+
+ StringRef name = f->getName();
+- IOCode ioc = (name.equals("read_uint32") ? READ_UINT32
+- : (name.equals("write_uint32") ? WRITE_UINT32
+- : (name.equals("read_float32") ? READ_FLOAT32
+- : (name.equals("write_float32") ? WRITE_FLOAT32
+- : (name.equals("read_float64") ? READ_FLOAT64
+- : (name.equals("write_float64") ? WRITE_FLOAT64
+- : (name.equals("write_uintptr") ? WRITE_UINTPTR
+- : (name.equals("read_uintptr") ? READ_UINTPTR
+- : (name.equals("write_pointer") ? WRITE_POINTER
+- : (name.equals("read_pointer") ? READ_POINTER
+- : (name.equals("write_uint16") ? WRITE_UINT16
+- : (name.equals("read_uint16") ? READ_UINT16
+- : (name.equals("write_uint8") ? WRITE_UINT8
+- : (name.equals("read_uint8") ? READ_UINT8
+- : (name.equals("write_uint64") ? WRITE_UINT64
+- : (name.equals("read_uint64") ? READ_UINT64
++ IOCode ioc = (name == "read_uint32" ? READ_UINT32
++ : (name == "write_uint32" ? WRITE_UINT32
++ : (name == "read_float32" ? READ_FLOAT32
++ : (name == "write_float32" ? WRITE_FLOAT32
++ : (name == "read_float64" ? READ_FLOAT64
++ : (name == "write_float64" ? WRITE_FLOAT64
++ : (name == "write_uintptr" ? WRITE_UINTPTR
++ : (name == "read_uintptr" ? READ_UINTPTR
++ : (name == "write_pointer" ? WRITE_POINTER
++ : (name == "read_pointer" ? READ_POINTER
++ : (name == "write_uint16" ? WRITE_UINT16
++ : (name == "read_uint16" ? READ_UINT16
++ : (name == "write_uint8" ? WRITE_UINT8
++ : (name == "read_uint8" ? READ_UINT8
++ : (name == "write_uint64" ? WRITE_UINT64
++ : (name == "read_uint64" ? READ_UINT64
+ : NOT_IO))))))))))))))));
+
+ return ioc;
+@@ -1385,7 +1385,7 @@ bool Aa::get_loop_pipelining_info(llvm::
+ if(f->isDeclaration())
+ {
+ StringRef name = f->getName();
+- if(name.equals("__loop_pipelining_on__"))
++ if(name == "__loop_pipelining_on__")
+ {
+ opt_fn_found = true;
+ if(C.getNumOperands() > 0)
Home |
Main Index |
Thread Index |
Old Index