From 07dd8f35d33d12a449f1ada1d0202cecb16090e5 Mon Sep 17 00:00:00 2001
From: Ben Cumming <louncharf@gmail.com>
Date: Tue, 16 May 2017 15:55:22 +0200
Subject: [PATCH] remove ineffectual compiler directives from nmodl generated
code (#270)
Remove some old compiler directives and properties from modcc-generated kernels that were not used by the intel compiler, and were not recognised by gcc.
Now the optimized x86 kernels can be compiled by both gcc and intel compilers.
---
modcc/cprinter.cpp | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/modcc/cprinter.cpp b/modcc/cprinter.cpp
index d48555b4..b871d60c 100644
--- a/modcc/cprinter.cpp
+++ b/modcc/cprinter.cpp
@@ -336,9 +336,7 @@ std::string CPrinter::emit_source() {
text_.add_line("array data_;");
for(auto var: array_variables) {
if(optimize_) {
- text_.add_line(
- "__declspec(align(array::alignment())) value_type *"
- + var->name() + ";");
+ text_.add_line("value_type *" + var->name() + ";");
}
else {
text_.add_line("view " + var->name() + ";");
@@ -661,13 +659,7 @@ void CPrinter::emit_api_loop(APIMethod* e,
}
void CPrinter::print_APIMethod_unoptimized(APIMethod* e) {
- // there can not be more than 1 instance of a density channel per grid point,
- // so we can assert that aliasing will not occur.
- if(optimize_) text_.add_line("#pragma ivdep");
-
emit_api_loop(e, "int i_ = 0", "i_ < n_", "++i_");
-
- //text_.add_line("STOP_PROFILE");
decrease_indentation();
return;
@@ -709,11 +701,8 @@ void CPrinter::print_APIMethod_optimized(APIMethod* e) {
text_.add_line("constexpr int BSIZE = 4;");
text_.add_line("int NB = n_/BSIZE;");
for(auto out: aliased_variables) {
- text_.add_line(
- "__declspec(align(array::alignment())) value_type "
- + out->name() + "[BSIZE];");
+ text_.add_line("value_type " + out->name() + "[BSIZE];");
}
- //text_.add_line("START_PROFILE");
text_.add_line("for(int b_=0; b_<NB; ++b_) {");
text_.increase_indentation();
@@ -721,10 +710,6 @@ void CPrinter::print_APIMethod_optimized(APIMethod* e) {
text_.add_line("int i_ = BSTART;");
- // assert that memory accesses are not aliased because we will
- // use ghost arrays to ensure that write-back of point processes does
- // not lead to race conditions
- text_.add_line("#pragma ivdep");
text_.add_line("for(int j_=0; j_<BSIZE; ++j_, ++i_) {");
text_.increase_indentation();
@@ -767,7 +752,6 @@ void CPrinter::print_APIMethod_optimized(APIMethod* e) {
// ------------- block tail loop ------------- //
text_.add_line("int j_ = 0;");
- text_.add_line("#pragma ivdep");
text_.add_line("for(int i_=NB*BSIZE; i_<n_; ++j_, ++i_) {");
text_.increase_indentation();
@@ -803,7 +787,6 @@ void CPrinter::print_APIMethod_optimized(APIMethod* e) {
text_.decrease_indentation();
text_.add_line("}"); // end block tail loop
- //text_.add_line("STOP_PROFILE");
decrease_indentation();
aliased_output_ = false;
--
GitLab