Changeset 661e7b0

Timestamp:

Aug 13, 2024, 11:54:04 AM (15 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

2870cb6, 4558df2

Parents:

4941716

Message:

After a years (or at least half a year) the CodeLocation optimization is merged in. Added Symbol (using Racket's name for interned strings), and used it for CodeLocation file names. The optimizes for the high number of copies - both instances with the same value and copy operations - and consistently brings down runtime by a few percent.

Location:

src

Files:

• CodeGen/CodeGenerator.cpp (modified) (1 diff)
• Common/CodeLocation.hpp (modified) (3 diffs)
• Common/Symbol.cpp (added)
• Common/Symbol.hpp (added)
• Common/module.mk (modified) (1 diff)
• InitTweak/FixInit.cpp (modified) (1 diff)

src/CodeGen/CodeGenerator.cpp

@@ -79 +79 @@
                 currentLocation.first_line += 2;
         } else {
-                output << "\n# " << to.first_line << " \"" << to.filename
+                output << "\n# " << to.first_line << " \"" << to.filename.c_str()
                        << "\"\n" << indent;
                 currentLocation = to;

src/Common/CodeLocation.hpp

@@ -17 +17 @@
 
 #include <iostream>
-#include <string>
+#include "Symbol.hpp"
 
 struct CodeLocation {
         int first_line = -1, first_column = -1, last_line = -1, last_column = -1;
-        std::string filename = "";
+        Symbol filename = "";
 
         /// Create a new unset CodeLocation.
@@ -46 +46 @@
 
         bool startsBefore( CodeLocation const & other ) const {
-                if( filename < other.filename ) return true;
-                if( filename > other.filename ) return false;
+                if( filename.str() < other.filename.str() ) return true;
+                if( filename.str() > other.filename.str() ) return false;
 
                 if( first_line < other.first_line ) return true;
@@ -72 +72 @@
 inline std::ostream & operator<<( std::ostream & out, const CodeLocation & location ) {
         // Column number ":1" allows IDEs to parse the error message and position the cursor in the source text.
-        return location.isSet() ? out << location.filename << ":" << location.first_line << ":1 " : out;
+        return location.isSet() ? out << location.filename.str() << ":" << location.first_line << ":1 " : out;
 }

src/Common/module.mk

@@ -48 +48 @@
         Common/Stats/Time.cpp \
         Common/Stats/Time.hpp \
+        Common/Symbol.cpp \
+        Common/Symbol.hpp \
         Common/ToString.hpp \
         Common/UniqueName.cpp \

src/InitTweak/FixInit.cpp

@@ -731 +731 @@
         try {
                 mutLast->expr = makeCtorDtor( "?{}", ret, mutLast->expr );
-        } catch(...) {
+        } catch (...) {
                 std::cerr << "*CFA internal error: ";
                 std::cerr << "can't resolve implicit constructor";
-                std::cerr << " at " << stmtExpr->location.filename;
+                std::cerr << " at " << stmtExpr->location.filename.c_str();
                 std::cerr << ":" << stmtExpr->location.first_line << std::endl;