Skip to content

13 solves/render => 62fps for me #6

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
josephlord wants to merge 9 commits into
base: master
Choose a base branch
from
Open

13 solves/render => 62fps for me #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70c9026
Merge branch 'actualStructs'
josephlord Aug 19, 2014
bfd8328
Capture self weakly in case the view controller is used in another co…
josephlord Aug 19, 2014
27f469f
Not linking but it may not be these changes.
josephlord Aug 21, 2014
473bdd8
Fix pixel order (and colours).
josephlord Aug 21, 2014
f5d8331
Tidy up comments in renderer.
josephlord Aug 21, 2014
905fcce
Remove unused protocol and a playground that didn't work too well.
josephlord Aug 21, 2014
8296999
Pull out the constants needing calculation as private globals.
josephlord Aug 21, 2014
aa8385e
Timing improvements
josephlord Aug 21, 2014
85a4553
62 fps by doing 13 solves/render.
josephlord Aug 21, 2014
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
4 changes: 0 additions & 4 deletions ThreadsExperiment.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
3E7AECD81997E5FE00EFC5EC /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7AECD71997E5FE00EFC5EC /* Constants.swift */; };
3EF4B99D1991EA37004FC621 /* GrayScottStruct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EF4B99C1991EA37004FC621 /* GrayScottStruct.swift */; };
3EF4B99F1991ECAF004FC621 /* GrayScottProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EF4B99E1991ECAF004FC621 /* GrayScottProtocol.swift */; };
BE0E5C68198CA26700395741 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0E5C67198CA26700395741 /* AppDelegate.swift */; };
BE0E5C6B198CA26700395741 /* ThreadsExperiment.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BE0E5C69198CA26700395741 /* ThreadsExperiment.xcdatamodeld */; };
BE0E5C6D198CA26700395741 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0E5C6C198CA26700395741 /* ViewController.swift */; };
Expand All @@ -35,7 +34,6 @@
/* Begin PBXFileReference section */
3E7AECD71997E5FE00EFC5EC /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
3EF4B99C1991EA37004FC621 /* GrayScottStruct.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GrayScottStruct.swift; sourceTree = "<group>"; };
3EF4B99E1991ECAF004FC621 /* GrayScottProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GrayScottProtocol.swift; sourceTree = "<group>"; };
BE0E5C62198CA26700395741 /* ThreadsExperiment.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ThreadsExperiment.app; sourceTree = BUILT_PRODUCTS_DIR; };
BE0E5C66198CA26700395741 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BE0E5C67198CA26700395741 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -82,7 +80,6 @@
isa = PBXGroup;
children = (
3EF4B99C1991EA37004FC621 /* GrayScottStruct.swift */,
3EF4B99E1991ECAF004FC621 /* GrayScottProtocol.swift */,
);
name = structs;
sourceTree = "<group>";
Expand Down Expand Up @@ -266,7 +263,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3EF4B99F1991ECAF004FC621 /* GrayScottProtocol.swift in Sources */,
BE0E5C6D198CA26700395741 /* ViewController.swift in Sources */,
BE623418198DFE2100C0A592 /* GrayScottRenderer.swift in Sources */,
BE67FA84198E55420009D31E /* IntExtension.swift in Sources */,
Expand Down
15 changes: 0 additions & 15 deletions ThreadsExperiment/GrayScottProtocol.swift
View file
Open in desktop

This file was deleted.

52 changes: 37 additions & 15 deletions ThreadsExperiment/GrayScottRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,53 @@
import Foundation
import UIKit

struct PixelData {
var a:UInt8 = 255
var r:UInt8
var g:UInt8
var b:UInt8
}

private let rgbColorSpace = CGColorSpaceCreateDeviceRGB()
private let bitmapInfo:CGBitmapInfo = CGBitmapInfo(CGImageAlphaInfo.PremultipliedFirst.toRaw())

private func imageFromARGB32Bitmap(pixels:[PixelData], width:UInt, height:UInt)->UIImage {
let bitsPerComponent:UInt = 8
let bitsPerPixel:UInt = 32

var data = pixels // Copy to mutable []
let providerRef = CGDataProviderCreateWithCFData(NSData(bytes: &data, length: data.count * sizeof(PixelData)))

let cgim = CGImageCreate(width, height, bitsPerComponent, bitsPerPixel, width * UInt(sizeof(PixelData)), rgbColorSpace, bitmapInfo, providerRef, nil, true, kCGRenderingIntentDefault)
return UIImage(CGImage: cgim)
}

private var statsCount = 0
func renderGrayScott(grayScottData:[GrayScottStruct])->UIImage
{
let startTime : CFAbsoluteTime = CFAbsoluteTimeGetCurrent();

UIGraphicsBeginImageContextWithOptions(CGSize(width: Constants.LENGTH, height: Constants.LENGTH), true, 1);
let context = UIGraphicsGetCurrentContext();
let stats = statsCount % 1024 == 0
var startTime : CFAbsoluteTime?
if stats {
startTime = CFAbsoluteTimeGetCurrent();
}
var pixelArray = [PixelData](count: Constants.LENGTH_SQUARED, repeatedValue: PixelData(a: 255, r:0, g: 0, b: 0))

for i in 0 ..< Constants.LENGTH
{
for j in 0 ..< Constants.LENGTH
{
let grayScottCell : GrayScottStruct = grayScottData[i * Constants.LENGTH + j] as GrayScottStruct;

CGContextSetRGBFillColor (context, CGFloat(grayScottCell.u), CGFloat(grayScottCell.u), CGFloat(grayScottCell.v), 1);
CGContextFillRect (context, CGRectMake (CGFloat(i), CGFloat(j), 1, 1));
let grayScottCell : GrayScottStruct = grayScottData[i * Constants.LENGTH + j]
let index = i * Constants.LENGTH + j
let u_I = UInt8(grayScottCell.u * 255)
pixelArray[index].r = u_I
pixelArray[index].g = u_I
pixelArray[index].b = UInt8(grayScottCell.v * 255)
}
}

let outputImage = UIGraphicsGetImageFromCurrentImageContext();

UIGraphicsEndImageContext();

println(" R RENDER:" + NSString(format: "%.4f", CFAbsoluteTimeGetCurrent() - startTime));

let outputImage = imageFromARGB32Bitmap(pixelArray, UInt(Constants.LENGTH), UInt(Constants.LENGTH))
if stats {
println(" R RENDER:" + NSString(format: "%.4f", CFAbsoluteTimeGetCurrent() - startTime!));
}
++statsCount
return outputImage
}
15 changes: 10 additions & 5 deletions ThreadsExperiment/GrayScottSolver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ struct GrayScottParmeters {
var dV : Double
}


private var solverstatsCount = 0
func grayScottSolver(grayScottConstData: [GrayScottStruct], parameters:GrayScottParmeters)->[GrayScottStruct] {
let startTime : CFAbsoluteTime = CFAbsoluteTimeGetCurrent();
let stats = solverstatsCount % 1024 == 0
var startTime : CFAbsoluteTime?
if stats {
startTime = CFAbsoluteTimeGetCurrent();
}

var index : Int = 0;
var outputArray = grayScottConstData // Copy to get array big enough
Expand Down Expand Up @@ -52,8 +56,9 @@ func grayScottSolver(grayScottConstData: [GrayScottStruct], parameters:GrayScott
}
}


println("S SOLVER:" + NSString(format: "%.4f", CFAbsoluteTimeGetCurrent() - startTime));

if stats {
println("S SOLVER:" + NSString(format: "%.4f", CFAbsoluteTimeGetCurrent() - startTime!));
}
++solverstatsCount
return outputArray
}
20 changes: 15 additions & 5 deletions ThreadsExperiment/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,28 @@ class ViewController: UIViewController
}
}


private var lastFrameCountTime = NSDate()
private var frameCount = 0
private func dispatchSolverOperation()
{
let dataCopy = grayScottData
let params = GrayScottParmeters(f: f, k: k, dU: dU, dV: dV)
weak var weakSelf = self
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0)) {
let newGSData = grayScottSolver(dataCopy, params)
let newGSData = grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(grayScottSolver(dataCopy, params), params), params), params), params), params), params), params), params), params), params), params), params)
let newImage = renderGrayScott(newGSData)
dispatch_async(dispatch_get_main_queue()) {
self.grayScottData = newGSData
self.imageView.image = newImage
self.dispatchSolverOperation()
if let s = weakSelf {
s.grayScottData = newGSData
s.imageView.image = newImage
s.dispatchSolverOperation()
if s.lastFrameCountTime.timeIntervalSinceNow < -1.0 {
println("Frame count = \(s.frameCount)")
s.frameCount = 0
s.lastFrameCountTime = NSDate()
}
++s.frameCount
}
}
}
}
Expand Down