[arch-commits] Commit in ispc/repos/community-x86_64 (4 files)

Bruno Pagani archange at archlinux.org
Tue Apr 30 18:29:56 UTC 2019


    Date: Tuesday, April 30, 2019 @ 18:29:55
  Author: archange
Revision: 457041

archrelease: copy trunk to community-x86_64

Added:
  ispc/repos/community-x86_64/PKGBUILD
    (from rev 457040, ispc/trunk/PKGBUILD)
Deleted:
  ispc/repos/community-x86_64/0001-Remove-uses-of-LLVM-dump-functions.patch
  ispc/repos/community-x86_64/Makefile.patch
  ispc/repos/community-x86_64/PKGBUILD

-----------------------------------------------+
 0001-Remove-uses-of-LLVM-dump-functions.patch |   68 ------------
 Makefile.patch                                |  130 ------------------------
 PKGBUILD                                      |   76 +++++++-------
 3 files changed, 39 insertions(+), 235 deletions(-)

Deleted: 0001-Remove-uses-of-LLVM-dump-functions.patch
===================================================================
--- 0001-Remove-uses-of-LLVM-dump-functions.patch	2019-04-30 18:29:41 UTC (rev 457040)
+++ 0001-Remove-uses-of-LLVM-dump-functions.patch	2019-04-30 18:29:55 UTC (rev 457041)
@@ -1,68 +0,0 @@
-diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
---- a/src/llvmutil.cpp
-+++ b/src/llvmutil.cpp
-@@ -45,6 +45,7 @@
-   #include <llvm/IR/Instructions.h>
-   #include <llvm/IR/BasicBlock.h>
- #endif
-+#include <llvm/Support/raw_os_ostream.h>
- #include <set>
- #include <map>
- 
-@@ -1550,7 +1551,7 @@ lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
-         return;
- 
-     fprintf(stderr, "  ");
--    v->dump();
-+    v->print(llvm::errs());
-     done.insert(v);
- 
-     if (inst == NULL)
-diff --git a/src/opt.cpp b/src/opt.cpp
---- a/src/opt.cpp
-+++ b/src/opt.cpp
-@@ -173,7 +173,7 @@ static llvm::Pass *CreatePromoteLocalToPrivatePass();
-                   strlen(getenv("FUNC"))))) {                           \
-         fprintf(stderr, "Start of " NAME "\n");                \
-         fprintf(stderr, "---------------\n");                  \
--        bb.dump();                                             \
-+        bb.print(llvm::errs());                                \
-         fprintf(stderr, "---------------\n\n");                \
-     } else /* eat semicolon */
- 
-@@ -184,7 +184,7 @@ static llvm::Pass *CreatePromoteLocalToPrivatePass();
-                   strlen(getenv("FUNC"))))) {                           \
-         fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \
-         fprintf(stderr, "---------------\n");                  \
--        bb.dump();                                             \
-+        bb.print(llvm::errs());                                \
-         fprintf(stderr, "---------------\n\n");                \
-     } else /* eat semicolon */
- 
-@@ -537,7 +537,7 @@ void
- Optimize(llvm::Module *module, int optLevel) {
-     if (g->debugPrint) {
-         printf("*** Code going into optimization ***\n");
--        module->dump();
-+        module->print(llvm::errs(), nullptr);
-     }
-     DebugPassManager optPM;
-     optPM.add(llvm::createVerifierPass(),0);
-@@ -932,7 +932,7 @@ Optimize(llvm::Module *module, int optLevel) {
- 
-     if (g->debugPrint) {
-         printf("\n*****\nFINAL OUTPUT\n*****\n");
--        module->dump();
-+        module->print(llvm::errs(), nullptr);
-     }
- 
- }
-@@ -4895,7 +4895,7 @@ bool
- DebugPass::runOnModule(llvm::Module &module) {
-     fprintf(stderr, "%s", str_output);
-     fflush(stderr);
--    module.dump();
-+    module.print(llvm::errs(), nullptr);
-     return true;
- }
- 

Deleted: Makefile.patch
===================================================================
--- Makefile.patch	2019-04-30 18:29:41 UTC (rev 457040)
+++ Makefile.patch	2019-04-30 18:29:55 UTC (rev 457041)
@@ -1,130 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -175,11 +175,11 @@
- 	$(LLVM_VERSION_DEF) \
- 	-Wall \
- 	-DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_VERSION="\"$(BUILD_VERSION)\"" \
--	-Wno-sign-compare -Wno-unused-function $(WERROR)
-+	-Wno-sign-compare -Wno-unused-function
- 
- # if( !($(LLVM_VERSION) == LLVM_3_2 || $(LLVM_VERSION) == LLVM_3_3 || $(LLVM_VERSION) == LLVM_3_4))
- ifeq (,$(filter $(LLVM_VERSION), LLVM_3_2 LLVM_3_3 LLVM_3_4))
--	CXXFLAGS+=-std=c++11 -Wno-c99-extensions -Wno-deprecated-register -fno-rtti
-+	CXXFLAGS+=-std=c++11 -fno-rtti
- endif
- ifneq ($(ARM_ENABLED), 0)
-     CXXFLAGS+=-DISPC_ARM_ENABLED
-@@ -240,7 +240,7 @@
- 
- depend: llvm_check $(CXX_SRC) $(HEADERS)
- 	@echo Updating dependencies
--	@$(CXX) -MM $(CXXFLAGS) $(CXX_SRC) | sed 's_^\([a-z]\)_objs/\1_g' > depend
-+	$(CXX) -MM $(CXXFLAGS) $(CXX_SRC) | sed 's_^\([a-z]\)_objs/\1_g' > depend
- 
- -include depend
- 
-@@ -273,7 +273,7 @@
- 
- ispc: print_deprecation_msg print_llvm_src dirs $(OBJS)
- 	@echo Creating ispc executable
--	@$(CXX) $(OPT) $(LDFLAGS) -o $@ $(OBJS) $(ISPC_LIBS)
-+	$(CXX) $(OPT) $(LDFLAGS) -o $@ $(OBJS) $(ISPC_LIBS)
- 
- # Use clang as a default compiler, instead of gcc
- # This is default now.
-@@ -295,77 +295,77 @@
- 
- objs/%.o: ${SRC_DIR}/%.cpp
- 	@echo Compiling $<
--	@$(CXX) $(CXXFLAGS) -o $@ -c $<
-+	$(CXX) $(CXXFLAGS) -o $@ -c $<
- 
- objs/cbackend.o: ${SRC_DIR}/cbackend.cpp
- 	@echo Compiling $<
--	@$(CXX) -fno-rtti -fno-exceptions $(CXXFLAGS) -o $@ -c $<
-+	$(CXX) -fno-rtti -fno-exceptions $(CXXFLAGS) -o $@ -c $<
- 
- objs/opt.o: ${SRC_DIR}/opt.cpp
- 	@echo Compiling $<
--	@$(CXX) -fno-rtti $(CXXFLAGS) -o $@ -c $<
-+	$(CXX) -fno-rtti $(CXXFLAGS) -o $@ -c $<
- 
- objs/%.o: objs/%.cpp
- 	@echo Compiling $<
--	@$(CXX) $(CXXFLAGS) -o $@ -c $<
-+	$(CXX) $(CXXFLAGS) -o $@ -c $<
- 
- objs/parse.cc: $(SRC_DIR)/parse.yy
- 	@echo Running bison on $<
--	@$(YACC) -o $@ $<
-+	$(YACC) -o $@ $<
- 
- objs/parse.o: objs/parse.cc $(HEADERS)
- 	@echo Compiling $<
--	@$(CXX) $(CXXFLAGS) -o $@ -c $<
-+	$(CXX) $(CXXFLAGS) -o $@ -c $<
- 
- objs/lex.cpp: $(SRC_DIR)/lex.ll
- 	@echo Running flex on $<
--	@$(LEX) -o $@ $<
-+	$(LEX) -o $@ $<
- 
- objs/lex.o: objs/lex.cpp $(HEADERS) objs/parse.cc
- 	@echo Compiling $<
--	@$(CXX) $(CXXFLAGS) -o $@ -c $<
-+	$(CXX) $(CXXFLAGS) -o $@ -c $<
- 
- objs/builtins-dispatch.cpp: builtins/dispatch.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
- 	@echo Creating C++ source from builtins definition file $<
--	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX $< | python bitcode2cpp.py $< > $@
-+	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX $< | python bitcode2cpp.py $< > $@
- 
- objs/builtins-%-32bit.cpp: builtins/%.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
- 	@echo Creating C++ source from builtins definition file $< \(32 bit version\)
--	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=32 $< | python bitcode2cpp.py $< 32bit > $@
-+	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=32 $< | python bitcode2cpp.py $< 32bit > $@
- 
- objs/builtins-%-64bit.cpp: builtins/%.ll builtins/util.m4 builtins/util-nvptx.m4 builtins/svml.m4 $(wildcard builtins/*common.ll)
- 	@echo Creating C++ source from builtins definition file $< \(64 bit version\)
--	@m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=64 $< | python bitcode2cpp.py $< 64bit > $@
-+	m4 -Ibuiltins/ -DLLVM_VERSION=$(LLVM_VERSION) -DBUILD_OS=UNIX -DRUNTIME=64 $< | python bitcode2cpp.py $< 64bit > $@
- 
- objs/builtins-c-32.cpp: builtins/builtins.c
- 	@echo Creating C++ source from builtins definition file $<
--	@$(CLANG) -m32 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 32 > $@
-+	$(CLANG) -m32 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 32 > $@
- 
- objs/builtins-c-64.cpp: builtins/builtins.c
- 	@echo Creating C++ source from builtins definition file $<
--	@$(CLANG) -m64 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 64 > $@
-+	$(CLANG) -m64 -emit-llvm -c $< -o - | llvm-dis - | python bitcode2cpp.py c 64 > $@
- 
- objs/stdlib_mask1_ispc.cpp: stdlib.ispc
- 	@echo Creating C++ source from $< for mask1
--	@$(CLANG) -E -x c -DISPC_MASK_BITS=1 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
-+	$(CLANG) -E -x c -DISPC_MASK_BITS=1 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
- 		python stdlib2cpp.py mask1 > $@
- 
- objs/stdlib_mask8_ispc.cpp: stdlib.ispc
- 	@echo Creating C++ source from $< for mask8
--	@$(CLANG) -E -x c -DISPC_MASK_BITS=8 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
-+	$(CLANG) -E -x c -DISPC_MASK_BITS=8 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
- 		python stdlib2cpp.py mask8 > $@
- 
- objs/stdlib_mask16_ispc.cpp: stdlib.ispc
- 	@echo Creating C++ source from $< for mask16
--	@$(CLANG) -E -x c -DISPC_MASK_BITS=16 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
-+	$(CLANG) -E -x c -DISPC_MASK_BITS=16 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
- 		python stdlib2cpp.py mask16 > $@
- 
- objs/stdlib_mask32_ispc.cpp: stdlib.ispc
- 	@echo Creating C++ source from $< for mask32
--	@$(CLANG) -E -x c -DISPC_MASK_BITS=32 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
-+	$(CLANG) -E -x c -DISPC_MASK_BITS=32 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
- 		python stdlib2cpp.py mask32 > $@
- 
- objs/stdlib_mask64_ispc.cpp: stdlib.ispc
- 	@echo Creating C++ source from $< for mask64
--	@$(CLANG) -E -x c -DISPC_MASK_BITS=64 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
-+	$(CLANG) -E -x c -DISPC_MASK_BITS=64 -DISPC=1 -DPI=3.14159265358979 $< -o - | \
- 		python stdlib2cpp.py mask64 > $@

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-30 18:29:41 UTC (rev 457040)
+++ PKGBUILD	2019-04-30 18:29:55 UTC (rev 457041)
@@ -1,37 +0,0 @@
-# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=ispc
-pkgver=1.10.0
-pkgrel=2
-pkgdesc="A compiler for high-performance SIMD programming on the CPU"
-arch=('x86_64')
-url="https://ispc.github.io/"
-license=('BSD')
-depends=('ncurses' 'zlib' 'llvm-libs' 'clang')
-makedepends=('llvm' 'python' 'lib32-glibc')
-source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/ispc/ispc/archive/v${pkgver}.tar.gz"
-        '0001-Remove-uses-of-LLVM-dump-functions.patch' # Borrowed from Fedora
-        'Makefile.patch') # Borrowed from Fedora
-sha256sums=('0aa30e989f8d446b2680c9078d5c5db70634f40b9aa07db387aa35aa08dd0b81'
-            '2cd47ff285b2a16053ee6b10fb9e7042b1c4e33cc195f00ecb0127a16cb1f737'
-            'c3bcbe52472973afa445989723f16f047cadda980b0adf11ba7ab4bf30e746f2')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ../0001-Remove-uses-of-LLVM-dump-functions.patch
-  patch -p1 -i ../Makefile.patch
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  # FS#60340
-  make gcc
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  install -Dm755 ispc -t "${pkgdir}"/usr/bin/
-  install -Dm644 LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}
-}
-

Copied: ispc/repos/community-x86_64/PKGBUILD (from rev 457040, ispc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-30 18:29:55 UTC (rev 457041)
@@ -0,0 +1,39 @@
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=ispc
+pkgver=1.11.0
+pkgrel=1
+pkgdesc="A compiler for high-performance SIMD programming on the CPU"
+arch=(x86_64)
+url="https://ispc.github.io/"
+license=(BSD)
+depends=(ncurses zlib llvm-libs clang)
+makedepends=(llvm python lib32-glibc cmake)
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/ispc/ispc/archive/v${pkgver}.tar.gz")
+sha256sums=('f48ef6e8a1fe5ad4fca691583bf7419f4dce1596e7ed850ff99cc017f8711b2f')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DISPC_INCLUDE_EXAMPLES=OFF \
+    -DISPC_NO_DUMPS=ON 
+  make
+}
+
+check() {
+  cd build
+  make check-all
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+  cd ../${pkgname}-${pkgver}
+  install -Dm644 LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}
+}


More information about the arch-commits mailing list