Skip to content

Add freq04.cpp: SIMD + hash-table optimized version of freq03.cpp #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metacircu1ar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add freq04.cpp: SIMD + hash-table optimized version of freq03.cpp #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
all : bin/freq01cpp bin/freq02cpp bin/freq03cpp bin/freq01rs bin/hack01cpp bin/freq01go bin/freq01scala.jar
CXX := g++
CXXFLAGS ?= -O3

ifeq ($(shell uname -s),Darwin)
CXXFLAGS += -Dlseek64=lseek -DMAP_POPULATE=0
endif

all : bin/freq01cpp bin/freq02cpp bin/freq03cpp bin/freq04cpp bin/freq01rs bin/hack01cpp bin/freq01go bin/freq01scala.jar

clean:
rm -f bin/freq01cpp bin/freq02cpp bin/freq03cpp bin/freq01rs bin/hack01cpp bin/freq01go
rm -f bin/freq01cpp bin/freq02cpp bin/freq03cpp bin/freq04cpp bin/freq01rs bin/hack01cpp bin/freq01go

bin/freq01cpp: src/freq01.cpp
g++ -O3 -o bin/freq01cpp src/freq01.cpp
$(CXX) $(CXXFLAGS) -o bin/freq01cpp src/freq01.cpp

bin/freq02cpp: src/freq02.cpp
g++ -O3 -o bin/freq02cpp src/freq02.cpp
$(CXX) $(CXXFLAGS) -o bin/freq02cpp src/freq02.cpp

bin/freq03cpp: src/freq03.cpp
g++ -O3 -o bin/freq03cpp src/freq03.cpp
$(CXX) $(CXXFLAGS) -o bin/freq03cpp src/freq03.cpp

bin/freq04cpp: src/freq04.cpp
$(CXX) $(CXXFLAGS) -std=c++11 -o bin/freq04cpp src/freq04.cpp

bin/hack01cpp: src/hack01.cpp
g++ -O3 -o bin/hack01cpp src/hack01.cpp
$(CXX) $(CXXFLAGS) -o bin/hack01cpp src/hack01.cpp

bin/freq01rs: src/freq01.rs
cd build/rust && cargo build --release
Expand Down
1 change: 1 addition & 0 deletions bench.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def run1(args, src_name, num_runs):
runs = [
[['java', '-jar', './bin/freq01scala.jar'], 'freq01.scala', 3],
[['python', './src/freq01.py'], 'freq01.py', 3],
[['./bin/freq04cpp' + EXE], 'freq04.cpp'],
[['./bin/freq03cpp' + EXE], 'freq03.cpp'],
[['./bin/freq02cpp' + EXE], 'freq02.cpp'],
[['./bin/freq01cpp' + EXE], 'freq01.cpp'],
Expand Down
3 changes: 3 additions & 0 deletions mk.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary
echo === freq03.cpp
cl.exe /permissive- /GS /GL /W3 /Gy /Zc:wchar_t /Gm- /O2 /sdl /Zc:inline /fp:precise /D "_MBCS" /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC /EHsc /nologo /diagnostics:column /Fo"bin\\" /Fe"bin\freq03cpp.exe" src\freq03.cpp src\ext\windows-mmap.c

echo === freq04.cpp
cl.exe /permissive- /GS /GL /W3 /Gy /Zc:wchar_t /Gm- /O2 /sdl /Zc:inline /fp:precise /D "_MBCS" /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC /EHsc /nologo /diagnostics:column /Fo"bin\\" /Fe"bin\freq04cpp.exe" src\freq04.cpp

echo === freq01.cpp
cl.exe /permissive- /GS /GL /W3 /Gy /Zc:wchar_t /Gm- /O2 /sdl /Zc:inline /fp:precise /D "_MBCS" /errorReport:prompt /WX- /Zc:forScope /Gd /Oi /MD /FC /EHsc /nologo /diagnostics:column /Fo"bin\\" /Fe"bin\freq01cpp.exe" src\freq01.cpp src\ext\windows-mmap.c

Expand Down
Loading