Merge remote-tracking branch 'origin/master'

graphql.yaml

@@ -139,6 +139,7 @@ ListType:
 Values:
     Val: [Value#val]
     Vals: [Value#val, comma, Values#follow]
+    ValsNoComma: [Value#val, Values#follow]
 
 Array:
     Empty: [lbrack, rbrack]
@@ -224,7 +225,7 @@ NamedTypes:
 
 ArgumentsDefinition:
     A: [lparen, InputValueDefinitions, rparen]
-    DA: [lparen, Description#des, InputValueDefinitions, rparen]
+    NA: [lparen, rparen]
 
 InputValueDefinitions:
     I: [InputValueDefinition#iv]
@@ -236,6 +237,10 @@ InputValueDefinition:
     TD: [name#name, colon, Type#type, Directives#dirs]
     TV: [name#name, colon, Type#type, DefaultValue#df]
     T: [name#name, colon, Type#type]
+    DTVD: [Description#des, name#name, colon, Type#type, DefaultValue#df, Directives#dirs]
+    DTD: [Description#des, name#name, colon, Type#type, Directives#dirs]
+    DTV: [Description#des, name#name, colon, Type#type, DefaultValue#df]
+    DT: [Description#des, name#name, colon, Type#type]
 
 InterfaceTypeDefinition:
     NDF: [interface_, name#name, Directives#dirs, lcurly,
@@ -264,6 +269,8 @@ EnumValueDefinitions:
 EnumValueDefinition:
     ED: [name#name, Directives#dirs]
     E: [name#name]
+    DED: [Description#des, name#name, Directives#dirs]
+    DE: [Description#des, name#name]
 
 InputTypeDefinition:
     NDE: [input, name#name, Directives#dir, lcurly,

perftest/calc.d

@@ -0,0 +1,137 @@
+import std;
+
+string[] strs =
+[ "Command being timed:"
+, "Percent of CPU this job got:"
+];
+
+string[] floats =
+[ "User time (seconds):"
+, "System time (seconds):"
+];
+
+string[] floats2 =
+[ "Elapsed (wall clock) time (h:mm:ss or m:ss):"
+];
+
+string[] longs =
+[ "Average shared text size (kbytes):"
+, "Average unshared data size (kbytes):"
+, "Average stack size (kbytes):"
+, "Average total size (kbytes):"
+, "Maximum resident set size (kbytes):"
+, "Average resident set size (kbytes):"
+, "Major (requiring I/O) page faults:"
+, "Minor (reclaiming a frame) page faults:"
+, "Voluntary context switches:"
+, "Involuntary context switches:"
+, "Swaps:"
+, "File system inputs:"
+, "File system outputs:"
+, "Socket messages sent:"
+, "Socket messages received:"
+, "Signals delivered:"
+, "Page size (bytes):"
+, "Exit status:"
+];
+
+string[] perf =
+[ "cache-references:u"
+, "cache-misses:u"
+, "cycles:u"
+, "instructions:u"
+, "branches:u"
+, "faults:u"
+, "migrations:u"
+, "L1-dcache-loads:u"
+, "L1-dcache-load-misses:u"
+, "ic_tag_hit_miss.all_instruction_cache_accesses:u"
+];
+
+double wallClock(string s) {
+	s = s.strip();
+	s = s[3 .. $];
+	return to!(double)(s);
+}
+
+void main(string[] args) {
+	long[string] longV;
+	double[string] floatV;
+
+	string[] lines = readText("out")
+		.splitter("\n")
+		.map!(l => l.strip())
+		.filter!(l => !l.empty)
+		.array;
+	o: foreach(l; lines) {
+		foreach(p; perf) {
+			ptrdiff_t i = l.indexOf(p);
+			if(i != -1) {
+				long v = l[0 .. i].strip().to!(long)();
+				if(p in longV) {
+					longV[p] += v;
+				} else {
+					longV[p] = v;
+				}
+				continue o;
+			}
+		}
+		foreach(p; longs) {
+			ptrdiff_t i = l.indexOf(p);
+			if(i != -1) {
+				long v = l[i + p.length .. $].strip().to!(long)();
+				if(p in longV) {
+					longV[p] += v;
+				} else {
+					longV[p] = v;
+				}
+				continue o;
+			}
+		}
+		foreach(string p; floats) {
+			ptrdiff_t i = l.indexOf(p);
+			if(i != -1) {
+				string s = l[0 .. i].strip();
+				if(s.empty) {
+					continue o;
+				}
+				double v = s.to!(double)();
+				if(p in floatV) {
+					floatV[p] += v;
+				} else {
+					floatV[p] = v;
+				}
+				continue o;
+			}
+		}
+		foreach(string p; floats2) {
+			ptrdiff_t i = l.indexOf(p);
+			if(i != -1) {
+				string s = l[p.length .. $].strip();
+				if(s.empty) {
+					continue o;
+				}
+				double v = wallClock(s);
+				if(p in floatV) {
+					floatV[p] += v;
+				} else {
+					floatV[p] = v;
+				}
+				continue o;
+			}
+		}
+	}
+	JSONValue j;
+	foreach(k, v; longV) {
+		j[k] = v;
+	}
+	foreach(k, v; floatV) {
+		j[k] = v;
+	}
+	j["l1misses"] = ((cast(double)longV["L1-dcache-load-misses:u"] /
+			longV["L1-dcache-loads:u"]) * 100);
+	j["cache_misses"] = ((cast(double)longV["cache-misses:u"] /
+			longV["cache-references:u"]) * 100);
+	auto f = File(args[1], "w");
+	f.writeln(j.toPrettyString());
+}

perftest/dub.json

@@ -0,0 +1,12 @@
+{
+	"authors": [
+		"Robert Schadek"
+	],
+	"dependencies": {
+		"graphqld": { "path" : "../" }
+	},
+	"copyright": "Copyright © 2024, Robert Schadek",
+	"description": "A minimal D application.",
+	"license": "GPL-3.0-or-later",
+	"name": "perftest"
+}

perftest/run.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/bash
+
+for i in $(seq 1 10);
+do
+	/usr/bin/time -v perf stat  -B -e cache-references,cache-misses,cycles,instructions,branches,faults,migrations,L1-dcache-loads,L1-dcache-load-misses,ic_tag_hit_miss.all_instruction_cache_accesses ./perftest
+done