-
Notifications
You must be signed in to change notification settings - Fork 33
Detailed Performance Metrics (Resolves Issue #104) #106
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.
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
Changes from all commits
f910cf3
805dce0
89f6b62
45c5a26
96adf3b
5ed313b
f62a618
fe8eceb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -132,10 +132,18 @@ public static List<Integer> generateTokensLlama(Model model, State state, int st | |
|
|
||
| // Calculate and print performance metrics | ||
| long endNanos = System.nanoTime(); | ||
| double totalTimeSeconds = (endNanos - startNanos) / 1_000_000_000.0; | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = endNanos; // Prevents negative time if no tokens were generated | ||
| } | ||
| int totalTokens = promptIndex + generatedTokens.size(); | ||
|
|
||
| LastRunMetrics.setMetrics(totalTokens, totalTimeSeconds); | ||
| long totalNanos = (endNanos - startNanos); | ||
| int promptEvalCount = promptIndex; | ||
| long promptNanos = inferenceStartNanos - startNanos; | ||
| int inferenceEvalCount = generatedTokens.size(); | ||
| long inferenceNanos = endNanos - inferenceStartNanos; | ||
| long tornadoCompileNanos = 0; | ||
| long tornadoWarmupNanos = 0; | ||
| LastRunMetrics.setMetrics(totalTokens, totalNanos, promptEvalCount, promptNanos, inferenceEvalCount, inferenceNanos, tornadoCompileNanos, tornadoWarmupNanos); | ||
|
|
||
| return generatedTokens; | ||
| } | ||
|
|
@@ -213,10 +221,18 @@ public static List<Integer> generateTokensQwen3(Model model, State state, int st | |
|
|
||
| // Calculate and print performance metrics | ||
| long endNanos = System.nanoTime(); | ||
| double totalTimeSeconds = (endNanos - startNanos) / 1_000_000_000.0; | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = endNanos; // Prevents negative time if no tokens were generated | ||
| } | ||
| int totalTokens = promptIndex + generatedTokens.size(); | ||
|
|
||
| LastRunMetrics.setMetrics(totalTokens, totalTimeSeconds); | ||
| long totalNanos = (endNanos - startNanos); | ||
| int promptEvalCount = promptIndex; | ||
| long promptNanos = inferenceStartNanos - startNanos; | ||
| int inferenceEvalCount = generatedTokens.size(); | ||
| long inferenceNanos = endNanos - inferenceStartNanos; | ||
| long tornadoCompileNanos = 0; | ||
| long tornadoWarmupNanos = 0; | ||
| LastRunMetrics.setMetrics(totalTokens, totalNanos, promptEvalCount, promptNanos, inferenceEvalCount, inferenceNanos, tornadoCompileNanos, tornadoWarmupNanos); | ||
|
Comment on lines
222
to
+235
|
||
|
|
||
| return generatedTokens; | ||
| } | ||
|
|
@@ -225,6 +241,7 @@ public static List<Integer> generateTokensPhi3(Model model, State state, int sta | |
| IntConsumer onTokenGenerated) { | ||
|
|
||
| long startNanos = System.nanoTime(); | ||
| long inferenceStartNanos = 0; | ||
| if (maxTokens < 0 || model.configuration().contextLength() < maxTokens) { | ||
| maxTokens = model.configuration().contextLength(); | ||
| } | ||
|
|
@@ -245,6 +262,9 @@ public static List<Integer> generateTokensPhi3(Model model, State state, int sta | |
| System.err.print(Tokenizer.replaceControlCharacters(model.tokenizer().decode(List.of(nextToken)))); | ||
| } | ||
| } else { | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = System.nanoTime(); | ||
| } | ||
| nextToken = sampler.sampleToken(state.logits); | ||
| if (echo) { | ||
| // log inferred token | ||
|
|
@@ -266,10 +286,18 @@ public static List<Integer> generateTokensPhi3(Model model, State state, int sta | |
|
|
||
| // Calculate and print performance metrics | ||
| long endNanos = System.nanoTime(); | ||
| double totalTimeSeconds = (endNanos - startNanos) / 1_000_000_000.0; | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = endNanos; // Prevents negative time if no tokens were generated | ||
| } | ||
| int totalTokens = promptIndex + generatedTokens.size(); | ||
|
|
||
| LastRunMetrics.setMetrics(totalTokens, totalTimeSeconds); | ||
| long totalNanos = (endNanos - startNanos); | ||
| int promptEvalCount = promptIndex; | ||
| long promptNanos = inferenceStartNanos - startNanos; | ||
| int inferenceEvalCount = generatedTokens.size(); | ||
| long inferenceNanos = endNanos - inferenceStartNanos; | ||
| long tornadoCompileNanos = 0; | ||
| long tornadoWarmupNanos = 0; | ||
| LastRunMetrics.setMetrics(totalTokens, totalNanos, promptEvalCount, promptNanos, inferenceEvalCount, inferenceNanos, tornadoCompileNanos, tornadoWarmupNanos); | ||
|
|
||
| return generatedTokens; | ||
|
|
||
|
|
@@ -354,13 +382,28 @@ public static List<Integer> generateTokensGPULlama(Model model, State state, int | |
| pos++; | ||
| } | ||
|
|
||
| // === Performance Metrics === | ||
| // Calculate and Print Performance Metrics | ||
| long endNanos = System.nanoTime(); | ||
| double totalSeconds = (endNanos - startNanos) / 1_000_000_000.0; | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = endNanos; // Prevents negative time if no tokens were generated | ||
| } | ||
| int totalTokens = promptIndex + generatedTokens.size(); | ||
|
|
||
| // Set metrics for tokens achieved | ||
| LastRunMetrics.setMetrics(totalTokens, totalSeconds); | ||
| long totalNanos = (endNanos - startNanos); | ||
| int promptEvalCount = promptIndex; | ||
| long promptNanos = inferenceStartNanos - startNanos; | ||
| int inferenceEvalCount = generatedTokens.size(); | ||
| long inferenceNanos = endNanos - inferenceStartNanos; | ||
| long tornadoCompileNanos = 0; | ||
| long tornadoWarmupNanos = 0; | ||
| // If statement to prevent inadvertent crashes from future features | ||
| if (tornadoVMPlan != null) { | ||
| tornadoCompileNanos = tornadoVMPlan.getCompileDurationNanos(); | ||
| tornadoWarmupNanos = tornadoVMPlan.getWarmupDurationNanos(); | ||
| // Reset values so they are only output if they are changed in tornadoVMMasterPlan.java | ||
| tornadoVMPlan.setCompileDurationNanos(0); | ||
| tornadoVMPlan.setWarmupDurationNanos(0); | ||
| } | ||
| LastRunMetrics.setMetrics(totalTokens, totalNanos, promptEvalCount, promptNanos, inferenceEvalCount, inferenceNanos, tornadoCompileNanos, tornadoWarmupNanos); | ||
|
|
||
| return generatedTokens; | ||
| } | ||
|
|
@@ -447,12 +490,28 @@ public static List<Integer> generateTokensGPUQwen3(Model model, State state, int | |
| state.latestToken = currentToken = nextToken; | ||
| } | ||
|
|
||
| // Calculate and print performance metrics | ||
| // Calculate and Print Performance Metrics | ||
| long endNanos = System.nanoTime(); | ||
| double totalTimeSeconds = (endNanos - startNanos) / 1_000_000_000.0; | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = endNanos; // Prevents negative time if no tokens were generated | ||
| } | ||
| int totalTokens = promptIndex + generatedTokens.size(); | ||
|
|
||
| LastRunMetrics.setMetrics(totalTokens, totalTimeSeconds); | ||
| long totalNanos = (endNanos - startNanos); | ||
| int promptEvalCount = promptIndex; | ||
| long promptNanos = inferenceStartNanos - startNanos; | ||
| int inferenceEvalCount = generatedTokens.size(); | ||
| long inferenceNanos = endNanos - inferenceStartNanos; | ||
| long tornadoCompileNanos = 0; | ||
| long tornadoWarmupNanos = 0; | ||
| // If statement to prevent inadvertent crashes from future features | ||
| if (tornadoVMPlan != null) { | ||
| tornadoCompileNanos = tornadoVMPlan.getCompileDurationNanos(); | ||
| tornadoWarmupNanos = tornadoVMPlan.getWarmupDurationNanos(); | ||
| // Reset values so they are only output if they are changed in tornadoVMMasterPlan.java | ||
| tornadoVMPlan.setCompileDurationNanos(0); | ||
| tornadoVMPlan.setWarmupDurationNanos(0); | ||
| } | ||
| LastRunMetrics.setMetrics(totalTokens, totalNanos, promptEvalCount, promptNanos, inferenceEvalCount, inferenceNanos, tornadoCompileNanos, tornadoWarmupNanos); | ||
|
Comment on lines
+493
to
+514
|
||
|
|
||
| return generatedTokens; | ||
| } | ||
|
|
@@ -522,12 +581,28 @@ public static List<Integer> generateTokensGPUPhi3(Model model, State state, int | |
| pos++; | ||
| } | ||
|
|
||
| // Calculate and print performance metrics | ||
| // Calculate and Print Performance Metrics | ||
| long endNanos = System.nanoTime(); | ||
| double totalTimeSeconds = (endNanos - startNanos) / 1_000_000_000.0; | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = endNanos; // Prevents negative time if no tokens were generated | ||
| } | ||
| int totalTokens = promptIndex + generatedTokens.size(); | ||
|
|
||
| LastRunMetrics.setMetrics(totalTokens, totalTimeSeconds); | ||
| long totalNanos = (endNanos - startNanos); | ||
| int promptEvalCount = promptIndex; | ||
| long promptNanos = inferenceStartNanos - startNanos; | ||
| int inferenceEvalCount = generatedTokens.size(); | ||
| long inferenceNanos = endNanos - inferenceStartNanos; | ||
| long tornadoCompileNanos = 0; | ||
| long tornadoWarmupNanos = 0; | ||
| // If statement to prevent inadvertent crashes from future features | ||
| if (tornadoVMPlan != null) { | ||
| tornadoCompileNanos = tornadoVMPlan.getCompileDurationNanos(); | ||
| tornadoWarmupNanos = tornadoVMPlan.getWarmupDurationNanos(); | ||
| // Reset values so they are only output if they are changed in tornadoVMMasterPlan.java | ||
| tornadoVMPlan.setCompileDurationNanos(0); | ||
| tornadoVMPlan.setWarmupDurationNanos(0); | ||
| } | ||
| LastRunMetrics.setMetrics(totalTokens, totalNanos, promptEvalCount, promptNanos, inferenceEvalCount, inferenceNanos, tornadoCompileNanos, tornadoWarmupNanos); | ||
|
|
||
| return generatedTokens; | ||
| } | ||
|
|
@@ -590,11 +665,20 @@ public static List<Integer> generateTokensGranite(Model model, State state, int | |
| pos++; | ||
| } | ||
|
|
||
| // Calculate and Print Performance Metrics | ||
| long endNanos = System.nanoTime(); | ||
| double totalTimeSeconds = (endNanos - startNanos) / 1_000_000_000.0; | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = endNanos; // Prevents negative time if no tokens were generated | ||
| } | ||
| int totalTokens = promptIndex + generatedTokens.size(); | ||
|
|
||
| LastRunMetrics.setMetrics(totalTokens, totalTimeSeconds); | ||
| long totalNanos = (endNanos - startNanos); | ||
| int promptEvalCount = promptIndex; | ||
| long promptNanos = inferenceStartNanos - startNanos; | ||
| int inferenceEvalCount = generatedTokens.size(); | ||
| long inferenceNanos = endNanos - inferenceStartNanos; | ||
| long tornadoCompileNanos = 0; | ||
| long tornadoWarmupNanos = 0; | ||
| LastRunMetrics.setMetrics(totalTokens, totalNanos, promptEvalCount, promptNanos, inferenceEvalCount, inferenceNanos, tornadoCompileNanos, tornadoWarmupNanos); | ||
|
|
||
| return generatedTokens; | ||
| } | ||
|
|
@@ -605,7 +689,7 @@ public static List<Integer> generateTokensGranite(Model model, State state, int | |
| */ | ||
| public static List<Integer> generateTokensGPUGranite(Model model, State state, int startPosition, | ||
| List<Integer> promptTokens, Set<Integer> stopTokens, int maxTokens, Sampler sampler, boolean echo, | ||
| IntConsumer onTokenGenerated, TornadoVMMasterPlan tornadoVMMasterPlan) { | ||
| IntConsumer onTokenGenerated, TornadoVMMasterPlan tornadoVMPlan) { | ||
| long startNanos = System.nanoTime(); | ||
| long inferenceStartNanos = 0; | ||
|
|
||
|
|
@@ -623,7 +707,7 @@ public static List<Integer> generateTokensGPUGranite(Model model, State state, i | |
|
|
||
| while (pos < maxTokens) { | ||
| // Call TornadoVM forward pass (same as Llama for now) | ||
| logits = InferenceCore.forwardTornadoVM(model, state, currentToken, pos, tornadoVMMasterPlan); | ||
| logits = InferenceCore.forwardTornadoVM(model, state, currentToken, pos, tornadoVMPlan); | ||
|
|
||
| if (promptIndex < promptTokens.size()) { | ||
| nextToken = promptTokens.get(promptIndex++); | ||
|
|
@@ -657,11 +741,28 @@ public static List<Integer> generateTokensGPUGranite(Model model, State state, i | |
| pos++; | ||
| } | ||
|
|
||
| // Calculate and Print Performance Metrics | ||
| long endNanos = System.nanoTime(); | ||
| double totalTimeSeconds = (endNanos - startNanos) / 1_000_000_000.0; | ||
| if (inferenceStartNanos == 0) { | ||
| inferenceStartNanos = endNanos; // Prevents negative time if no tokens were generated | ||
| } | ||
| int totalTokens = promptIndex + generatedTokens.size(); | ||
|
|
||
| LastRunMetrics.setMetrics(totalTokens, totalTimeSeconds); | ||
| long totalNanos = (endNanos - startNanos); | ||
| int promptEvalCount = promptIndex; | ||
| long promptNanos = inferenceStartNanos - startNanos; | ||
| int inferenceEvalCount = generatedTokens.size(); | ||
| long inferenceNanos = endNanos - inferenceStartNanos; | ||
| long tornadoCompileNanos = 0; | ||
| long tornadoWarmupNanos = 0; | ||
| // If statement to prevent inadvertent crashes from future features | ||
| if (tornadoVMPlan != null) { | ||
| tornadoCompileNanos = tornadoVMPlan.getCompileDurationNanos(); | ||
| tornadoWarmupNanos = tornadoVMPlan.getWarmupDurationNanos(); | ||
| // Reset values so they are only output if they are changed in tornadoVMMasterPlan.java | ||
| tornadoVMPlan.setCompileDurationNanos(0); | ||
| tornadoVMPlan.setWarmupDurationNanos(0); | ||
| } | ||
| LastRunMetrics.setMetrics(totalTokens, totalNanos, promptEvalCount, promptNanos, inferenceEvalCount, inferenceNanos, tornadoCompileNanos, tornadoWarmupNanos); | ||
|
|
||
| return generatedTokens; | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
printMetrics()computes throughputs via division bypromptSeconds,inferenceSeconds, andtotalSecondswithout guarding for zero durations. Several legitimate flows can yieldpromptNanos == 0orinferenceNanos == 0(e.g., when no inference tokens are generated andinferenceStartNanosis forced toendNanos), which will result inInfinity/NaNbeing printed. Add explicit checks (e.g., duration > 0 and count > 0) and print 0 or "N/A" when the corresponding duration is zero.